Prefix all executables with gittyup to support installation in path

Author: AHSauge

pack/CMakeLists.txt

@@ -311,9 +311,9 @@ if(WIN32)
             ${PACKAGE_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/Gittyup.pdb
             ${PACKAGE_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/indexer.exe
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/gittyup-indexer.exe
             ${PACKAGE_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/indexer.pdb
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/gittyup-indexer.pdb
             ${PACKAGE_DIR})
 
   add_dependencies(deploy package)

src/app/CMakeLists.txt

@@ -165,7 +165,7 @@ else()
   endif()
 endif()
 
-add_dependencies(gittyup indexer relauncher)
+add_dependencies(gittyup gittyup-indexer gittyup-relauncher)
 
 install(
   TARGETS gittyup
@@ -178,7 +178,7 @@ if(APPLE)
   get_filename_component(RPATH ${QT_FRAMEWORK} DIRECTORY)
 
   # Fixup relauncher RPATH.
-  set(RELAUNCHER ${CONTENTS_DIR}/MacOS/relauncher)
+  set(RELAUNCHER ${CONTENTS_DIR}/MacOS/gittyup-relauncher)
   install(
     CODE "execute_process(COMMAND
 		${CMAKE_INSTALL_NAME_TOOL} -delete_rpath \"${RPATH}\"
@@ -195,7 +195,7 @@ execute_process(COMMAND
     COMPONENT ${GITTYUP_NAME})
 
   # Fixup indexer RPATH.
-  set(INDEXER ${CONTENTS_DIR}/MacOS/indexer)
+  set(INDEXER ${CONTENTS_DIR}/MacOS/gittyup-indexer)
   install(
     CODE "execute_process(COMMAND
 		${CMAKE_INSTALL_NAME_TOOL} -delete_rpath \"${RPATH}\"

src/index/Indexer/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_executable(
-  indexer
+  gittyup-indexer
   main.cpp
   indexer.cpp
   diffgrabber.cpp
@@ -9,24 +9,26 @@ add_executable(
   common.cpp
   lexerpool.cpp
   idstorage.cpp)
-target_link_libraries(indexer index)
-target_compile_definitions(indexer PRIVATE GITTYUP_VERSION="${GITTYUP_VERSION}")
+target_link_libraries(gittyup-indexer index)
+target_compile_definitions(gittyup-indexer
+                           PRIVATE GITTYUP_VERSION="${GITTYUP_VERSION}")
 
-set_target_properties(indexer PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                         $<TARGET_FILE_DIR:gittyup>)
+set_target_properties(gittyup-indexer PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                                 $<TARGET_FILE_DIR:gittyup>)
 
 if(APPLE)
   set_target_properties(
-    indexer PROPERTIES INSTALL_RPATH "/usr/local/qt;@loader_path/../Frameworks")
+    gittyup-indexer PROPERTIES INSTALL_RPATH
+                               "/usr/local/qt;@loader_path/../Frameworks")
 else()
   if(WIN32)
-    target_link_libraries(indexer Dbghelp.lib)
+    target_link_libraries(gittyup-indexer Dbghelp.lib)
   elseif(NOT FLATAPK)
-    set_target_properties(indexer PROPERTIES INSTALL_RPATH "$ORIGIN")
+    set_target_properties(gittyup-indexer PROPERTIES INSTALL_RPATH "$ORIGIN")
   endif()
 
   install(
-    TARGETS indexer
+    TARGETS gittyup-indexer
     DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT ${GITTYUP_NAME})
 endif()

src/ui/RepoView.cpp

@@ -841,9 +841,9 @@ void RepoView::startIndexing() {
 
   QDir dir(QCoreApplication::applicationDirPath());
 #ifdef WIN32
-  auto indexer_cmd = dir.filePath("indexer.exe");
+  auto indexer_cmd = dir.filePath("gittyup-indexer.exe");
 #else
-  auto indexer_cmd = dir.filePath("indexer");
+  auto indexer_cmd = dir.filePath("gittyup-indexer");
 #endif
   QFileInfo check_file(indexer_cmd);
   if (!check_file.isFile()) {

src/update/CMakeLists.txt

@@ -19,21 +19,21 @@ target_link_libraries(
 
 set_target_properties(update PROPERTIES AUTOMOC ON)
 
-add_executable(relauncher relauncher.cpp)
-target_link_libraries(relauncher Qt6::Core)
+add_executable(gittyup-relauncher relauncher.cpp)
+target_link_libraries(gittyup-relauncher Qt6::Core)
 
-set_target_properties(relauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                            $<TARGET_FILE_DIR:gittyup>)
+set_target_properties(gittyup-relauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                                    $<TARGET_FILE_DIR:gittyup>)
 
 if(APPLE)
   set_target_properties(
-    relauncher PROPERTIES INSTALL_RPATH
-                          "/usr/local/qt;@loader_path/../Frameworks")
+    gittyup-relauncher PROPERTIES INSTALL_RPATH
+                                  "/usr/local/qt;@loader_path/../Frameworks")
 elseif(UNIX)
-  set_target_properties(relauncher PROPERTIES INSTALL_RPATH "$ORIGIN")
+  set_target_properties(gittyup-relauncher PROPERTIES INSTALL_RPATH "$ORIGIN")
 
   install(
-    TARGETS relauncher
+    TARGETS gittyup-relauncher
     DESTINATION ${CMAKE_INSTALL_BINDIR}
     COMPONENT ${GITTYUP_NAME})
 endif()

src/update/Updater.cpp

@@ -338,7 +338,7 @@ bool Updater::install(const DownloadRef &download, QString &error) {
   }
   p->deleteLater();
 
-  auto relauncher_cmd = dir.filePath("relauncher");
+  auto relauncher_cmd = dir.filePath("gittyup-relauncher");
   Debug("Relauncher command: " << relauncher_cmd);
 
   // Start the relaunch helper.
@@ -365,7 +365,8 @@ bool Updater::install(const DownloadRef &download, QString &error) {
   // Start the relaunch helper.
   QString app = QCoreApplication::applicationFilePath();
   QString pid = QString::number(QCoreApplication::applicationPid());
-  if (!QProcess::startDetached(dir.filePath("relauncher"), {app, pid})) {
+  if (!QProcess::startDetached(dir.filePath("gittyup-relauncher"),
+                               {app, pid})) {
     error = tr("Helper application failed to start");
     return false;
   }

src/update/Updater_mac.mm

@@ -113,7 +113,7 @@ QString mountPoint() const
   QDir dir(QCoreApplication::applicationDirPath());
   QString app = QCoreApplication::applicationFilePath();
   QString pid = QString::number(QCoreApplication::applicationPid());
-  if (!QProcess::startDetached(dir.filePath("relauncher"), {app, pid})) {
+  if (!QProcess::startDetached(dir.filePath("gittyup-relauncher"), {app, pid})) {
     error = tr("Helper application failed to start");
     return false;
   }