diff --git a/.appveyor.yml b/.appveyor.yml index 2feae079..7b41a129 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,10 @@ image: - Ubuntu build_script: - cmd: msbuild .\update\build\win32\update.vcxproj - - cmd: msbuild .\standalone\build\win32\Tracy.vcxproj + - cmd: msbuild .\profiler\build\win32\Tracy.vcxproj - cmd: msbuild .\capture\build\win32\capture.vcxproj - sh: sudo apt-get update && sudo apt-get -y install libglfw3-dev libgtk2.0-dev - sh: make -C update/build/unix debug release - - sh: make -C standalone/build/unix debug release + - sh: make -C profiler/build/unix debug release - sh: make -C capture/build/unix debug release test: off diff --git a/NEWS b/NEWS index 88da9839..de72d881 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ a mistake. v0.4 (xxxx-xx-xx) ----------------- +- Renamed "standalone" utility to "profiler". - Added trace update utility, which will convert files saved in previous versions of tracy to be up-to-date. - Fix regression causing varying size of profiler window for different @@ -37,9 +38,9 @@ v0.4 (xxxx-xx-xx) - Added named versions of tracing macros that allow specifying scoped variable name. - The main profiler window is now kept at the bottom of windows stack. -- The "standalone" utility will now use a custom embedded font. +- The "profiler" utility will now use a custom embedded font. - Microseconds are now displayed using correct symbol ('μ' instead of 'u'). -- Unix builds of the "standalone" utility will now ask for a file name when +- Unix builds of the "profiler" utility will now ask for a file name when saving a trace. - Progress popup is now displayed when a trace file is loading. - Zones that share source location with a zone that is hovered over are now @@ -47,7 +48,7 @@ v0.4 (xxxx-xx-xx) - Added ability to zoom-in to a selection range made using middle mouse button. - Holding the ctrl key will switch to zoom-out mode. -- The "standalone" utility will use less resources when its window is +- The "profiler" utility will use less resources when its window is out-of-focus or minimized. - Added support for cross-DLL profiling. - Items in options menu (locks, threads, etc.) are now described with number diff --git a/manual/tracy.tex b/manual/tracy.tex index 08f09686..29d92446 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -155,7 +155,7 @@ You should compile the main library with the \texttt{tracy/TracyClient.cpp} sour \subsection{Running the server} -The easiest way to get going is to build the standalone server, available in the \texttt{standalone} directory. You can connect to localhost or remote clients and view the collected data right away. +The easiest way to get going is to build the standalone server, available in the \texttt{profiler} directory. You can connect to localhost or remote clients and view the collected data right away. If you prefer to inspect the data only after a trace has been performed, you may use the command line utility in the \texttt{capture} directory. It will save a data dump that may be later opened in the graphical viewer application. diff --git a/standalone/build/unix/Makefile b/profiler/build/unix/Makefile similarity index 100% rename from standalone/build/unix/Makefile rename to profiler/build/unix/Makefile diff --git a/standalone/build/unix/build.mk b/profiler/build/unix/build.mk similarity index 100% rename from standalone/build/unix/build.mk rename to profiler/build/unix/build.mk diff --git a/standalone/build/unix/debug.mk b/profiler/build/unix/debug.mk similarity index 100% rename from standalone/build/unix/debug.mk rename to profiler/build/unix/debug.mk diff --git a/standalone/build/unix/release.mk b/profiler/build/unix/release.mk similarity index 100% rename from standalone/build/unix/release.mk rename to profiler/build/unix/release.mk diff --git a/standalone/build/win32/DebugVis.natvis b/profiler/build/win32/DebugVis.natvis similarity index 100% rename from standalone/build/win32/DebugVis.natvis rename to profiler/build/win32/DebugVis.natvis diff --git a/standalone/build/win32/Tracy.sln b/profiler/build/win32/Tracy.sln similarity index 100% rename from standalone/build/win32/Tracy.sln rename to profiler/build/win32/Tracy.sln diff --git a/standalone/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj similarity index 100% rename from standalone/build/win32/Tracy.vcxproj rename to profiler/build/win32/Tracy.vcxproj diff --git a/standalone/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters similarity index 100% rename from standalone/build/win32/Tracy.vcxproj.filters rename to profiler/build/win32/Tracy.vcxproj.filters diff --git a/standalone/libs/gl3w/GL/gl3w.c b/profiler/libs/gl3w/GL/gl3w.c similarity index 100% rename from standalone/libs/gl3w/GL/gl3w.c rename to profiler/libs/gl3w/GL/gl3w.c diff --git a/standalone/libs/gl3w/GL/gl3w.h b/profiler/libs/gl3w/GL/gl3w.h similarity index 100% rename from standalone/libs/gl3w/GL/gl3w.h rename to profiler/libs/gl3w/GL/gl3w.h diff --git a/standalone/libs/gl3w/GL/glcorearb.h b/profiler/libs/gl3w/GL/glcorearb.h similarity index 100% rename from standalone/libs/gl3w/GL/glcorearb.h rename to profiler/libs/gl3w/GL/glcorearb.h diff --git a/standalone/libs/glfw/COPYING.txt b/profiler/libs/glfw/COPYING.txt similarity index 100% rename from standalone/libs/glfw/COPYING.txt rename to profiler/libs/glfw/COPYING.txt diff --git a/standalone/libs/glfw/include/GLFW/glfw3.h b/profiler/libs/glfw/include/GLFW/glfw3.h similarity index 100% rename from standalone/libs/glfw/include/GLFW/glfw3.h rename to profiler/libs/glfw/include/GLFW/glfw3.h diff --git a/standalone/libs/glfw/include/GLFW/glfw3native.h b/profiler/libs/glfw/include/GLFW/glfw3native.h similarity index 100% rename from standalone/libs/glfw/include/GLFW/glfw3native.h rename to profiler/libs/glfw/include/GLFW/glfw3native.h diff --git a/standalone/libs/glfw/lib-vc2015/glfw3.lib b/profiler/libs/glfw/lib-vc2015/glfw3.lib similarity index 100% rename from standalone/libs/glfw/lib-vc2015/glfw3.lib rename to profiler/libs/glfw/lib-vc2015/glfw3.lib diff --git a/standalone/src/Arimo.hpp b/profiler/src/Arimo.hpp similarity index 100% rename from standalone/src/Arimo.hpp rename to profiler/src/Arimo.hpp diff --git a/standalone/src/imgui_impl_glfw_gl3.cpp b/profiler/src/imgui_impl_glfw_gl3.cpp similarity index 100% rename from standalone/src/imgui_impl_glfw_gl3.cpp rename to profiler/src/imgui_impl_glfw_gl3.cpp diff --git a/standalone/src/imgui_impl_glfw_gl3.h b/profiler/src/imgui_impl_glfw_gl3.h similarity index 100% rename from standalone/src/imgui_impl_glfw_gl3.h rename to profiler/src/imgui_impl_glfw_gl3.h diff --git a/standalone/src/main.cpp b/profiler/src/main.cpp similarity index 100% rename from standalone/src/main.cpp rename to profiler/src/main.cpp