From e52ce58541db7bd05be8f8ef17705f8bf9d39f86 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 28 Oct 2024 21:31:33 -0400 Subject: [PATCH] build: rm SERVER_BINARY_NAME define --- cmake/Build.cmake | 2 +- cmake/Definitions.cmake | 6 ------ deploy/dist/wix/Include.wxi.in | 2 +- src/cmd/deskflow-core/deskflow-core.cpp | 2 +- src/cmd/deskflows/CMakeLists.txt | 11 +++++------ src/lib/deskflow/DaemonApp.cpp | 2 +- src/lib/deskflow/ServerApp.cpp | 2 +- src/lib/gui/config/AppConfig.cpp | 8 +++++--- src/lib/gui/config/AppConfig.h | 6 +++++- src/lib/platform/MSWindowsWatchdog.cpp | 2 +- src/test/unittests/deskflow/ServerAppTests.cpp | 2 +- 11 files changed, 22 insertions(+), 23 deletions(-) diff --git a/cmake/Build.cmake b/cmake/Build.cmake index 7592d92fe..e7d2958c4 100644 --- a/cmake/Build.cmake +++ b/cmake/Build.cmake @@ -97,7 +97,7 @@ macro(post_config_all) run_post_build deskflow ${CLIENT_BINARY_NAME} - ${SERVER_BINARY_NAME} + deskflow-server ${DAEMON_BINARY_NAME}) endif() diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 54ffa30d1..4c7ac0c23 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -73,10 +73,6 @@ endmacro() macro(configure_bin_names) - set(SERVER_BINARY_NAME - "deskflow-server" - CACHE STRING "Filename of the server binary") - set(CLIENT_BINARY_NAME "deskflow-client" CACHE STRING "Filename of the client binary") @@ -90,13 +86,11 @@ macro(configure_bin_names) CACHE STRING "Filename of the daemon binary") - message(VERBOSE "Server binary: ${SERVER_BINARY_NAME}") message(VERBOSE "Client binary: ${CLIENT_BINARY_NAME}") message(VERBOSE "Core binary: ${CORE_BINARY_NAME}") message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}") - add_definitions(-DSERVER_BINARY_NAME="${SERVER_BINARY_NAME}") add_definitions(-DCLIENT_BINARY_NAME="${CLIENT_BINARY_NAME}") add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}") add_definitions(-DDAEMON_BINARY_NAME="${DAEMON_BINARY_NAME}") diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in index 526775780..45cfd91ba 100644 --- a/deploy/dist/wix/Include.wxi.in +++ b/deploy/dist/wix/Include.wxi.in @@ -22,7 +22,7 @@ - + diff --git a/src/cmd/deskflow-core/deskflow-core.cpp b/src/cmd/deskflow-core/deskflow-core.cpp index f104f9d18..246a2920b 100644 --- a/src/cmd/deskflow-core/deskflow-core.cpp +++ b/src/cmd/deskflow-core/deskflow-core.cpp @@ -29,7 +29,7 @@ void showHelp() { std::cout << "Usage: " CORE_BINARY_NAME " [...options]" << std::endl; - std::cout << "server - start as a server (" << SERVER_BINARY_NAME << ")" << std::endl; + std::cout << "server - start as a server ( deskflow-server)" << std::endl; std::cout << "client - start as a client (" << CLIENT_BINARY_NAME << ")" << std::endl; std::cout << "use " CORE_BINARY_NAME " --help for more information." << std::endl; } diff --git a/src/cmd/deskflows/CMakeLists.txt b/src/cmd/deskflows/CMakeLists.txt index c656ed9b5..1350787b0 100644 --- a/src/cmd/deskflows/CMakeLists.txt +++ b/src/cmd/deskflows/CMakeLists.txt @@ -15,14 +15,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(server_source_name "deskflows") -set(target ${SERVER_BINARY_NAME}) +set(target deskflow-server) if(WIN32) set(PLATFORM_SOURCES - ${server_source_name}.exe.manifest - ${server_source_name}.ico - ${server_source_name}.rc + deskflows.exe.manifest + deskflows.ico + deskflows.rc MSWindowsServerTaskBarReceiver.cpp MSWindowsServerTaskBarReceiver.h resource.h @@ -44,7 +43,7 @@ elseif(UNIX) ) endif() -add_executable(${target} ${PLATFORM_SOURCES} "${server_source_name}.cpp") +add_executable(${target} ${PLATFORM_SOURCES} deskflows.cpp) target_link_libraries( ${target} diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp index 6500ef22a..3f1492887 100644 --- a/src/lib/deskflow/DaemonApp.cpp +++ b/src/lib/deskflow/DaemonApp.cpp @@ -78,7 +78,7 @@ bool isServerCommandLine(const std::vector &cmd) auto isServer = false; if (cmd.size() > 1) { - isServer = (cmd[0].find(SERVER_BINARY_NAME) != String::npos) || + isServer = (cmd[0].find("deskflow-server") != String::npos) || (cmd[0].find(CORE_BINARY_NAME) != String::npos && cmd[1] == "server"); } diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 126b011d8..fef215393 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -847,7 +847,7 @@ const char *ServerApp::daemonName() const #if SYSAPI_WIN32 return "Deskflow Server"; #elif SYSAPI_UNIX - return SERVER_BINARY_NAME; + return "deskflow-server"; #endif } diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index 5df0c59ab..8ea7b87fc 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -35,11 +35,9 @@ const int kWizardVersion = 8; static const char *const kLogLevelNames[] = {"INFO", "DEBUG", "DEBUG1", "DEBUG2"}; #if defined(Q_OS_WIN) -const char AppConfig::m_CoreServerName[] = SERVER_BINARY_NAME ".exe"; const char AppConfig::m_CoreClientName[] = CLIENT_BINARY_NAME ".exe"; const char AppConfig::m_LogDir[] = "log/"; #else -const char AppConfig::m_CoreServerName[] = SERVER_BINARY_NAME; const char AppConfig::m_CoreClientName[] = CLIENT_BINARY_NAME; const char AppConfig::m_LogDir[] = "/var/log/"; #endif @@ -469,7 +467,11 @@ QString AppConfig::lastVersion() const QString AppConfig::coreServerName() const { - return m_CoreServerName; +#ifdef Q_OS_WIN + return s_winExeTemplate.arg(s_CoreServerName); +#else + return s_CoreServerName; +#endif } QString AppConfig::coreClientName() const diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 83a492dcf..9473f7f48 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -289,7 +289,11 @@ private: */ QString defaultTlsCertPath() const; - static const char m_CoreServerName[]; + // Used to make the server and client names on windows. +#ifdef Q_OS_WIN + inline static const auto s_winExeTemplate = QStringLiteral("%1.exe"); +#endif + inline static const auto s_CoreServerName = QStringLiteral("deskflow-server"); static const char m_CoreClientName[]; static const char m_LogDir[]; diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index 95e5aab3c..1dcbffd3e 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -571,7 +571,7 @@ void MSWindowsWatchdog::shutdownExistingProcesses() if (entry.th32ProcessID != 0) { if (_stricmp(entry.szExeFile, CLIENT_BINARY_NAME ".exe") == 0 || - _stricmp(entry.szExeFile, SERVER_BINARY_NAME ".exe") == 0 || + _stricmp(entry.szExeFile, "deskflow-server.exe") == 0 || _stricmp(entry.szExeFile, CORE_BINARY_NAME ".exe") == 0) { HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID); diff --git a/src/test/unittests/deskflow/ServerAppTests.cpp b/src/test/unittests/deskflow/ServerAppTests.cpp index e6f826612..7edddfd47 100644 --- a/src/test/unittests/deskflow/ServerAppTests.cpp +++ b/src/test/unittests/deskflow/ServerAppTests.cpp @@ -40,7 +40,7 @@ TEST(ServerAppTests, runInner_will_handle_configuration_lifetime) EXPECT_FALSE(app.args().m_config); - const char *argv[]{SERVER_BINARY_NAME}; + const char *argv[]{"deskflow-server"}; app.runInner(1, const_cast(argv), nullptr, [](int, char **) { return 0; }); EXPECT_TRUE(app.args().m_config);