From ccc60ff900b7727993176021e9c7cb48375d27c0 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 22 Dec 2024 09:19:16 -0500 Subject: [PATCH] refactor: mv deskflow[s|c|d] to deskflow-server, deskflow-client and deskflow-deamon --- src/apps/CMakeLists.txt | 6 +++--- src/apps/{deskflowc => deskflow-client}/.gitignore | 0 src/apps/{deskflowc => deskflow-client}/CMakeLists.txt | 6 +++--- .../MSWindowsClientTaskBarReceiver.cpp | 0 .../MSWindowsClientTaskBarReceiver.h | 0 .../OSXClientTaskBarReceiver.cpp | 0 .../OSXClientTaskBarReceiver.h | 0 .../XWindowsClientTaskBarReceiver.cpp | 0 .../XWindowsClientTaskBarReceiver.h | 0 .../deskflowc.cpp => deskflow-client/deskflow-client.cpp} | 0 .../deskflow-client.exe.manifest} | 0 .../deskflowc.rc => deskflow-client/deskflow-client.rc} | 0 src/apps/{deskflowc => deskflow-client}/resource.h | 0 src/apps/{deskflowd => deskflow-daemon}/CMakeLists.txt | 2 +- .../deskflowd.cpp => deskflow-daemon/deskflow-daemon.cpp} | 0 src/apps/{deskflows => deskflow-server}/.gitignore | 0 src/apps/{deskflows => deskflow-server}/CMakeLists.txt | 6 +++--- .../MSWindowsServerTaskBarReceiver.cpp | 0 .../MSWindowsServerTaskBarReceiver.h | 0 .../OSXServerTaskBarReceiver.cpp | 0 .../OSXServerTaskBarReceiver.h | 0 .../XWindowsServerTaskBarReceiver.cpp | 0 .../XWindowsServerTaskBarReceiver.h | 0 .../deskflows.cpp => deskflow-server/deskflow-server.cpp} | 0 .../deskflow-server.exe.manifest} | 0 .../deskflows.rc => deskflow-server/deskflow-server.rc} | 0 src/apps/{deskflows => deskflow-server}/resource.h | 0 27 files changed, 10 insertions(+), 10 deletions(-) rename src/apps/{deskflowc => deskflow-client}/.gitignore (100%) rename src/apps/{deskflowc => deskflow-client}/CMakeLists.txt (94%) rename src/apps/{deskflowc => deskflow-client}/MSWindowsClientTaskBarReceiver.cpp (100%) rename src/apps/{deskflowc => deskflow-client}/MSWindowsClientTaskBarReceiver.h (100%) rename src/apps/{deskflowc => deskflow-client}/OSXClientTaskBarReceiver.cpp (100%) rename src/apps/{deskflowc => deskflow-client}/OSXClientTaskBarReceiver.h (100%) rename src/apps/{deskflowc => deskflow-client}/XWindowsClientTaskBarReceiver.cpp (100%) rename src/apps/{deskflowc => deskflow-client}/XWindowsClientTaskBarReceiver.h (100%) rename src/apps/{deskflowc/deskflowc.cpp => deskflow-client/deskflow-client.cpp} (100%) rename src/apps/{deskflowc/deskflowc.exe.manifest => deskflow-client/deskflow-client.exe.manifest} (100%) rename src/apps/{deskflowc/deskflowc.rc => deskflow-client/deskflow-client.rc} (100%) rename src/apps/{deskflowc => deskflow-client}/resource.h (100%) rename src/apps/{deskflowd => deskflow-daemon}/CMakeLists.txt (98%) rename src/apps/{deskflowd/deskflowd.cpp => deskflow-daemon/deskflow-daemon.cpp} (100%) rename src/apps/{deskflows => deskflow-server}/.gitignore (100%) rename src/apps/{deskflows => deskflow-server}/CMakeLists.txt (94%) rename src/apps/{deskflows => deskflow-server}/MSWindowsServerTaskBarReceiver.cpp (100%) rename src/apps/{deskflows => deskflow-server}/MSWindowsServerTaskBarReceiver.h (100%) rename src/apps/{deskflows => deskflow-server}/OSXServerTaskBarReceiver.cpp (100%) rename src/apps/{deskflows => deskflow-server}/OSXServerTaskBarReceiver.h (100%) rename src/apps/{deskflows => deskflow-server}/XWindowsServerTaskBarReceiver.cpp (100%) rename src/apps/{deskflows => deskflow-server}/XWindowsServerTaskBarReceiver.h (100%) rename src/apps/{deskflows/deskflows.cpp => deskflow-server/deskflow-server.cpp} (100%) rename src/apps/{deskflows/deskflows.exe.manifest => deskflow-server/deskflow-server.exe.manifest} (100%) rename src/apps/{deskflows/deskflows.rc => deskflow-server/deskflow-server.rc} (100%) rename src/apps/{deskflows => deskflow-server}/resource.h (100%) diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index cd9d7613b..dca488ab2 100644 --- a/src/apps/CMakeLists.txt +++ b/src/apps/CMakeLists.txt @@ -18,12 +18,12 @@ option(BUILD_UNIFIED "Build unified binary" OFF) if(BUILD_UNIFIED) add_subdirectory(deskflow-core) else() - add_subdirectory(deskflowc) - add_subdirectory(deskflows) + add_subdirectory(deskflow-client) + add_subdirectory(deskflow-server) endif(BUILD_UNIFIED) ## Only used on windows -add_subdirectory(deskflowd) +add_subdirectory(deskflow-daemon) option(BUILD_GUI "Build GUI" ON) if(BUILD_GUI) diff --git a/src/apps/deskflowc/.gitignore b/src/apps/deskflow-client/.gitignore similarity index 100% rename from src/apps/deskflowc/.gitignore rename to src/apps/deskflow-client/.gitignore diff --git a/src/apps/deskflowc/CMakeLists.txt b/src/apps/deskflow-client/CMakeLists.txt similarity index 94% rename from src/apps/deskflowc/CMakeLists.txt rename to src/apps/deskflow-client/CMakeLists.txt index 980608d56..62c770a36 100644 --- a/src/apps/deskflowc/CMakeLists.txt +++ b/src/apps/deskflow-client/CMakeLists.txt @@ -19,8 +19,8 @@ set(target deskflow-client) if(WIN32) set(PLATFORM_SOURCES - deskflowc.exe.manifest - deskflowc.rc + deskflow-client.exe.manifest + deskflow-client.rc MSWindowsClientTaskBarReceiver.cpp MSWindowsClientTaskBarReceiver.h resource.h @@ -42,7 +42,7 @@ elseif(UNIX) ) endif() -add_executable(${target} ${PLATFORM_SOURCES} deskflowc.cpp) +add_executable(${target} ${PLATFORM_SOURCES} deskflow-client.cpp) target_link_libraries( ${target} diff --git a/src/apps/deskflowc/MSWindowsClientTaskBarReceiver.cpp b/src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflowc/MSWindowsClientTaskBarReceiver.cpp rename to src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.cpp diff --git a/src/apps/deskflowc/MSWindowsClientTaskBarReceiver.h b/src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.h similarity index 100% rename from src/apps/deskflowc/MSWindowsClientTaskBarReceiver.h rename to src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.h diff --git a/src/apps/deskflowc/OSXClientTaskBarReceiver.cpp b/src/apps/deskflow-client/OSXClientTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflowc/OSXClientTaskBarReceiver.cpp rename to src/apps/deskflow-client/OSXClientTaskBarReceiver.cpp diff --git a/src/apps/deskflowc/OSXClientTaskBarReceiver.h b/src/apps/deskflow-client/OSXClientTaskBarReceiver.h similarity index 100% rename from src/apps/deskflowc/OSXClientTaskBarReceiver.h rename to src/apps/deskflow-client/OSXClientTaskBarReceiver.h diff --git a/src/apps/deskflowc/XWindowsClientTaskBarReceiver.cpp b/src/apps/deskflow-client/XWindowsClientTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflowc/XWindowsClientTaskBarReceiver.cpp rename to src/apps/deskflow-client/XWindowsClientTaskBarReceiver.cpp diff --git a/src/apps/deskflowc/XWindowsClientTaskBarReceiver.h b/src/apps/deskflow-client/XWindowsClientTaskBarReceiver.h similarity index 100% rename from src/apps/deskflowc/XWindowsClientTaskBarReceiver.h rename to src/apps/deskflow-client/XWindowsClientTaskBarReceiver.h diff --git a/src/apps/deskflowc/deskflowc.cpp b/src/apps/deskflow-client/deskflow-client.cpp similarity index 100% rename from src/apps/deskflowc/deskflowc.cpp rename to src/apps/deskflow-client/deskflow-client.cpp diff --git a/src/apps/deskflowc/deskflowc.exe.manifest b/src/apps/deskflow-client/deskflow-client.exe.manifest similarity index 100% rename from src/apps/deskflowc/deskflowc.exe.manifest rename to src/apps/deskflow-client/deskflow-client.exe.manifest diff --git a/src/apps/deskflowc/deskflowc.rc b/src/apps/deskflow-client/deskflow-client.rc similarity index 100% rename from src/apps/deskflowc/deskflowc.rc rename to src/apps/deskflow-client/deskflow-client.rc diff --git a/src/apps/deskflowc/resource.h b/src/apps/deskflow-client/resource.h similarity index 100% rename from src/apps/deskflowc/resource.h rename to src/apps/deskflow-client/resource.h diff --git a/src/apps/deskflowd/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt similarity index 98% rename from src/apps/deskflowd/CMakeLists.txt rename to src/apps/deskflow-daemon/CMakeLists.txt index 9e36c589a..d8285bc0e 100644 --- a/src/apps/deskflowd/CMakeLists.txt +++ b/src/apps/deskflow-daemon/CMakeLists.txt @@ -19,7 +19,7 @@ if(WIN32) set(target deskflow-daemon) add_executable(${target} WIN32 - deskflowd.cpp + deskflow-daemon.cpp "${PROJECT_BINARY_DIR}/src/version.rc" ) diff --git a/src/apps/deskflowd/deskflowd.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp similarity index 100% rename from src/apps/deskflowd/deskflowd.cpp rename to src/apps/deskflow-daemon/deskflow-daemon.cpp diff --git a/src/apps/deskflows/.gitignore b/src/apps/deskflow-server/.gitignore similarity index 100% rename from src/apps/deskflows/.gitignore rename to src/apps/deskflow-server/.gitignore diff --git a/src/apps/deskflows/CMakeLists.txt b/src/apps/deskflow-server/CMakeLists.txt similarity index 94% rename from src/apps/deskflows/CMakeLists.txt rename to src/apps/deskflow-server/CMakeLists.txt index c5850f337..2c243732b 100644 --- a/src/apps/deskflows/CMakeLists.txt +++ b/src/apps/deskflow-server/CMakeLists.txt @@ -19,8 +19,8 @@ set(target deskflow-server) if(WIN32) set(PLATFORM_SOURCES - deskflows.exe.manifest - deskflows.rc + deskflow-server.exe.manifest + deskflow-server.rc MSWindowsServerTaskBarReceiver.cpp MSWindowsServerTaskBarReceiver.h resource.h @@ -42,7 +42,7 @@ elseif(UNIX) ) endif() -add_executable(${target} ${PLATFORM_SOURCES} deskflows.cpp) +add_executable(${target} ${PLATFORM_SOURCES} deskflow-server.cpp) target_link_libraries( ${target} diff --git a/src/apps/deskflows/MSWindowsServerTaskBarReceiver.cpp b/src/apps/deskflow-server/MSWindowsServerTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflows/MSWindowsServerTaskBarReceiver.cpp rename to src/apps/deskflow-server/MSWindowsServerTaskBarReceiver.cpp diff --git a/src/apps/deskflows/MSWindowsServerTaskBarReceiver.h b/src/apps/deskflow-server/MSWindowsServerTaskBarReceiver.h similarity index 100% rename from src/apps/deskflows/MSWindowsServerTaskBarReceiver.h rename to src/apps/deskflow-server/MSWindowsServerTaskBarReceiver.h diff --git a/src/apps/deskflows/OSXServerTaskBarReceiver.cpp b/src/apps/deskflow-server/OSXServerTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflows/OSXServerTaskBarReceiver.cpp rename to src/apps/deskflow-server/OSXServerTaskBarReceiver.cpp diff --git a/src/apps/deskflows/OSXServerTaskBarReceiver.h b/src/apps/deskflow-server/OSXServerTaskBarReceiver.h similarity index 100% rename from src/apps/deskflows/OSXServerTaskBarReceiver.h rename to src/apps/deskflow-server/OSXServerTaskBarReceiver.h diff --git a/src/apps/deskflows/XWindowsServerTaskBarReceiver.cpp b/src/apps/deskflow-server/XWindowsServerTaskBarReceiver.cpp similarity index 100% rename from src/apps/deskflows/XWindowsServerTaskBarReceiver.cpp rename to src/apps/deskflow-server/XWindowsServerTaskBarReceiver.cpp diff --git a/src/apps/deskflows/XWindowsServerTaskBarReceiver.h b/src/apps/deskflow-server/XWindowsServerTaskBarReceiver.h similarity index 100% rename from src/apps/deskflows/XWindowsServerTaskBarReceiver.h rename to src/apps/deskflow-server/XWindowsServerTaskBarReceiver.h diff --git a/src/apps/deskflows/deskflows.cpp b/src/apps/deskflow-server/deskflow-server.cpp similarity index 100% rename from src/apps/deskflows/deskflows.cpp rename to src/apps/deskflow-server/deskflow-server.cpp diff --git a/src/apps/deskflows/deskflows.exe.manifest b/src/apps/deskflow-server/deskflow-server.exe.manifest similarity index 100% rename from src/apps/deskflows/deskflows.exe.manifest rename to src/apps/deskflow-server/deskflow-server.exe.manifest diff --git a/src/apps/deskflows/deskflows.rc b/src/apps/deskflow-server/deskflow-server.rc similarity index 100% rename from src/apps/deskflows/deskflows.rc rename to src/apps/deskflow-server/deskflow-server.rc diff --git a/src/apps/deskflows/resource.h b/src/apps/deskflow-server/resource.h similarity index 100% rename from src/apps/deskflows/resource.h rename to src/apps/deskflow-server/resource.h