frameretrace: remove unnecessary underscore from binary name

frameretrace more closely matches apitrace naming conventions than
frame_retrace.

7 files changed, 13 insertions, 13 deletions

diff --git a/retrace/daemon/glframe_logger.cpp b/retrace/daemon/glframe_logger.cpp
index 6bba91bd..bebd2683 100644
--- a/retrace/daemon/glframe_logger.cpp
+++ b/retrace/daemon/glframe_logger.cpp
@@ -54,7 +54,7 @@ Logger::Create() {
     const char *dir = "/tmp";
 #endif
   std::stringstream ss;
-  ss << dir << "/" << "frame_retrace.log";
+  ss << dir << "/" << "frameretrace.log";
   m_instance = new Logger(ss.str());
 }
 
diff --git a/retrace/daemon/glframe_win_shaders.cpp b/retrace/daemon/glframe_win_shaders.cpp
index a61e0114..bac26ffc 100644
--- a/retrace/daemon/glframe_win_shaders.cpp
+++ b/retrace/daemon/glframe_win_shaders.cpp
@@ -40,7 +40,7 @@ void WinShaders::init() {
   // open the directory
   const DWORD pid = GetCurrentProcessId();
   std::stringstream shader_dump_dir;
-  shader_dump_dir << "C:\\Intel\\IGC\\frame_retrace_server.exe_" << pid << "\\";
+  shader_dump_dir << "C:\\Intel\\IGC\\frameretrace_server.exe_" << pid << "\\";
   m_dump_dir = shader_dump_dir.str();
   shader_dump_dir << "*";
   m_dump_pattern = shader_dump_dir.str();
diff --git a/retrace/daemon/server/CMakeLists.txt b/retrace/daemon/server/CMakeLists.txt
index bcad4951..e48ceab9 100644
--- a/retrace/daemon/server/CMakeLists.txt
+++ b/retrace/daemon/server/CMakeLists.txt
@@ -11,7 +11,7 @@ set (SERVER_SRC
   main.cpp
   )
 
-add_executable(frame_retrace_server
+add_executable(frameretrace_server
   ${SERVER_SRC}
 )
 
@@ -23,7 +23,7 @@ else()
   set (THREAD_LIB pthread dl)
 endif()
 
-target_link_libraries(frame_retrace_server
+target_link_libraries(frameretrace_server
   retrace_daemon
   glretrace_common
   glhelpers
@@ -34,7 +34,7 @@ target_link_libraries(frame_retrace_server
   ${THREAD_LIB}
 )
 
-install (TARGETS frame_retrace_server RUNTIME DESTINATION bin) 
+install (TARGETS frameretrace_server RUNTIME DESTINATION bin) 
 
 if (NOT WIN32)
   Lint(SERVER_SRC)
diff --git a/retrace/daemon/server/main.cpp b/retrace/daemon/server/main.cpp
index e8cb34b0..8741d2ac 100644
--- a/retrace/daemon/server/main.cpp
+++ b/retrace/daemon/server/main.cpp
@@ -52,7 +52,7 @@ int parse_args(int argc, char *argv[]) {
         return atoi(optarg);
       case 'h':
       default: /* '?' */
-        printf("USAGE: frame_retrace_server [-p port]\n"
+        printf("USAGE: frameretrace_server [-p port]\n"
                "\tdefault port: 24642");
         break;
     }
diff --git a/retrace/daemon/ui/CMakeLists.txt b/retrace/daemon/ui/CMakeLists.txt
index 3d63646c..22b959d8 100644
--- a/retrace/daemon/ui/CMakeLists.txt
+++ b/retrace/daemon/ui/CMakeLists.txt
@@ -43,7 +43,7 @@ set (UI_SRC
   glframe_uniform_model.cpp
   )
 
-add_executable(frame_retrace
+add_executable(frameretrace
   ${UI_SRC}
   ${UIS_HDRS}
   ${RESOURCE_ADDED} 
@@ -57,7 +57,7 @@ else()
   set (THREAD_LIB pthread dl)
 endif()
 
-target_link_libraries(frame_retrace
+target_link_libraries(frameretrace
   retrace_daemon
   retrace_bargraph
   glretrace_common
@@ -70,6 +70,6 @@ target_link_libraries(frame_retrace
   ${THREAD_LIB}
 )
 
-install (TARGETS frame_retrace RUNTIME DESTINATION bin) 
+install (TARGETS frameretrace RUNTIME DESTINATION bin) 
 
 Lint(UI_SRC)
diff --git a/retrace/daemon/ui/glframe_retrace_model.cpp b/retrace/daemon/ui/glframe_retrace_model.cpp
index 79939910..2d9efd1d 100644
--- a/retrace/daemon/ui/glframe_retrace_model.cpp
+++ b/retrace/daemon/ui/glframe_retrace_model.cpp
@@ -100,7 +100,7 @@ static QFuture<FrameState *> future;
 
 void
 exec_retracer(const char *main_exe, int port) {
-  // frame_retrace_server should be at the same path as frame_retrace
+  // frameretrace_server should be at the same path as frameretrace
   std::string server_exe(main_exe);
 
   char sep;
@@ -108,10 +108,10 @@ exec_retracer(const char *main_exe, int port) {
 
 #ifdef WIN32
   sep = '\\';
-  server_exe_name = "frame_retrace_server.exe";
+  server_exe_name = "frameretrace_server.exe";
 #else
   sep = '/';
-  server_exe_name = "frame_retrace_server";
+  server_exe_name = "frameretrace_server";
 #endif
 
   size_t last_sep = server_exe.rfind(sep);
diff --git a/retrace/daemon/ui/main.cpp b/retrace/daemon/ui/main.cpp
index 928420d7..8dcca829 100644
--- a/retrace/daemon/ui/main.cpp
+++ b/retrace/daemon/ui/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
   QGuiApplication app(argc, argv);
   app.setOrganizationName("Open Source Technology Center");
   app.setOrganizationDomain("intel.com");
-  app.setApplicationName("frame_retrace");
+  app.setApplicationName("frameretrace");
 
   qRegisterMetaType<glretrace::ExperimentId>();
   qRegisterMetaType<glretrace::SelectionId>();