Merge remote-tracking branch 'remotes/origin/dev' into feature/new-gui

service/server/CMakeLists.txt

@@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat Widgets)
 qt_standard_project_setup()
 
+configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
 set(HEADERS
         ${CMAKE_CURRENT_LIST_DIR}/../../client/utilities.h
         ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc.h
@@ -18,6 +20,7 @@ set(HEADERS
         ${CMAKE_CURRENT_LIST_DIR}/logger.h
         ${CMAKE_CURRENT_LIST_DIR}/router.h
         ${CMAKE_CURRENT_LIST_DIR}/systemservice.h
+        ${CMAKE_CURRENT_BINARY_DIR}/version.h
 )
 
 set(SOURCES
@@ -91,11 +94,16 @@ include_directories(
 add_executable(${PROJECT} ${SOURCES} ${HEADERS})
 target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat Qt6::Widgets ${LIBS})
 
-qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_interface.rep)
-if(NOT IOS)
-    qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_process_interface.rep)
+if(APPLE)
+    set_target_properties(${PROJECT} PROPERTIES
+        INSTALL_RPATH "@executable_path/../Frameworks"
+        BUILD_WITH_INSTALL_RPATH TRUE
+    )
 endif()
 
+qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_interface.rep)
+qt_add_repc_sources(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipc_process_interface.rep)
+
 # copy deploy artifacts required to run the application to the debug build folder
 if(WIN32)
     if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
@@ -109,12 +117,10 @@ elseif(APPLE AND NOT IOS)
     set(DEPLOY_ARTIFACT_PATH "macos")
 endif()
 
-if(NOT IOS AND NOT ANDROID)
-    add_custom_command(
-        TARGET ${PROJECT} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
-        ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH}
-        $<TARGET_FILE_DIR:${PROJECT}>
-        COMMAND_EXPAND_LISTS
-    )
-endif()
+add_custom_command(
+    TARGET ${PROJECT} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
+    ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH}
+    $<TARGET_FILE_DIR:${PROJECT}>
+    COMMAND_EXPAND_LISTS
+)

service/server/logger.cpp

@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-#include "defines.h"
+#include "version.h"
 #include "utilities.h"
 
 QFile Logger::m_file;

service/server/main.cpp

@@ -1,6 +1,6 @@
 #include <QDir>
 
-#include "defines.h"
+#include "version.h"
 #include "localserver.h"
 #include "logger.h"
 #include "systemservice.h"

service/server/server.pro

@@ -1,71 +0,0 @@
-TARGET   = AmneziaVPN-service
-TEMPLATE = app
-CONFIG   += console qt no_batch
-QT += core network remoteobjects
-equals(QT_MAJOR_VERSION, 6): QT += core5compat
-
-HEADERS = \
-        ../../client/utilities.h \
-        ../../ipc/ipc.h \
-        ../../ipc/ipcserver.h \
-        ../../ipc/ipcserverprocess.h \
-        localserver.h \
-        logger.h \
-        router.h \
-        systemservice.h
-
-SOURCES = \
-        ../../client/utilities.cpp \
-        ../../ipc/ipcserver.cpp \
-        ../../ipc/ipcserverprocess.cpp \
-        localserver.cpp \
-        logger.cpp \
-        main.cpp \
-        router.cpp \
-        systemservice.cpp
-
-win32 {
-HEADERS += \
-        tapcontroller_win.h \
-        router_win.h
-
-SOURCES += \
-        tapcontroller_win.cpp \
-        router_win.cpp
-
-LIBS += \
-        -luser32 \
-        -lrasapi32 \
-        -lshlwapi \
-        -liphlpapi \
-        -lws2_32 \
-        -liphlpapi \
-        -lgdi32 \
-        -lAdvapi32 \
-        -lKernel32
-}
-
-macx {
-HEADERS += \
-    router_mac.h \
-    helper_route_mac.h
-
-SOURCES += \
-    router_mac.cpp \
-    helper_route_mac.c
-}
-
-linux {
-HEADERS += \
-    router_linux.h
-
-SOURCES += \
-    router_linux.cpp
-}
-
-include(../src/qtservice.pri)
-
-INCLUDEPATH += "$$PWD/../../client"
-
-REPC_SOURCE += ../../ipc/ipc_interface.rep
-!ios: REPC_SOURCE += ../../ipc/ipc_process_interface.rep

service/server/systemservice.cpp

@@ -1,4 +1,4 @@
-#include "defines.h"
+#include "version.h"
 #include "localserver.h"
 #include "systemservice.h"