added version.h file generation

- deleted files for qmake

AmneziaVPN.pro

@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = client
-
-!ios:!android {
-   SUBDIRS += service
-}

CMakeLists.txt

@@ -1,7 +1,12 @@
 cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
-project(${PROJECT})
+
+set(BUILD_ID 1)
+project(${PROJECT} VERSION 2.1.2 
+        DESCRIPTION "AmneziaVPN"
+        HOMEPAGE_URL "https://amnezia.org/"
+)
 
 if(ANDROID)
     set(QT_ANDROID_BUILD_ALL_ABIS ON)

client/CMakeLists.txt

@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
-project(${PROJECT} VERSION 2.1.2)
+project(${PROJECT})
-set(BUILD_ID 1)
+
-SET(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
+set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
@@ -58,6 +58,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
 set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc.h
     ${CMAKE_CURRENT_LIST_DIR}/amnezia_application.h
@@ -75,6 +77,7 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/ui/uilogic.h
     ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.h
     ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/version.h
 )
 
 if(NOT IOS)
@@ -136,6 +139,11 @@ qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 if(WIN32)
     add_compile_definitions(MVPN_WINDOWS)
 
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/windows/amneziavpn.rc.in 
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/windows/amneziavpn.rc
+    )
+
     set(HEADERS ${HEADERS}
         ${CMAKE_CURRENT_LIST_DIR}/protocols/ikev2_vpn_protocol_windows.h
     )
@@ -343,7 +351,6 @@ endif()
 if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
     message("Building for iPhone OS")
     set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
-
 endif()
 
 qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})

client/amnezia_application.cpp

@@ -8,7 +8,7 @@
 
 #include "core/servercontroller.h"
 #include "logger.h"
-#include "defines.h"
+#include "version.h"
 #include <QQuickStyle>
 
 #include "platforms/ios/QRCodeReaderBase.h"

client/client.pro

@@ -1,411 +0,0 @@
-QT += widgets core gui network xml remoteobjects quick svg quickcontrols2
-equals(QT_MAJOR_VERSION, 6): QT += core5compat
-
-TARGET = AmneziaVPN
-TEMPLATE = app
-
-# silent builds on CI env
-IS_CI=$$(CI)
-!isEmpty(IS_CI){
-  message("Detected CI env")
-  CONFIG += silent #ccache
-}
-
-CONFIG += qtquickcompiler
-
-include("3rd/QtSsh/src/ssh/qssh.pri")
-include("3rd/QtSsh/src/botan/botan.pri")
-!android:!ios:include("3rd/SingleApplication/singleapplication.pri")
-include ("3rd/SortFilterProxyModel/SortFilterProxyModel.pri")
-
-include("3rd/qrcodegen/qrcodegen.pri")
-include("3rd/QSimpleCrypto/QSimpleCrypto.pri")
-include("3rd/qtkeychain/qtkeychain.pri")
-
-INCLUDEPATH += $$PWD/3rd/QSimpleCrypto/include
-INCLUDEPATH += $$PWD/3rd/OpenSSL/include
-DEPENDPATH += $$PWD/3rd/OpenSSL/include
-
-HEADERS  += \
-    ../ipc/ipc.h \
-    amnezia_application.h \
-    configurators/cloak_configurator.h \
-    configurators/configurator_base.h \
-    configurators/ikev2_configurator.h \
-    configurators/shadowsocks_configurator.h \
-    configurators/ssh_configurator.h \
-    configurators/vpn_configurator.h \
-    configurators/wireguard_configurator.h \
-    containers/containers_defs.h \
-    core/defs.h \
-    core/errorstrings.h \
-    configurators/openvpn_configurator.h \
-    core/scripts_registry.h \
-    core/server_defs.h \
-    core/servercontroller.h \
-    defines.h \
-    logger.h \
-    managementserver.h \
-    platforms/ios/MobileUtils.h \
-    platforms/linux/leakdetector.h \
-    protocols/protocols_defs.h \
-    secure_qsettings.h \
-    settings.h \
-    ui/notificationhandler.h \
-    ui/models/containers_model.h \
-    ui/models/protocols_model.h \
-    ui/pages.h \
-    ui/pages_logic/AppSettingsLogic.h \
-    ui/pages_logic/GeneralSettingsLogic.h \
-    ui/pages_logic/NetworkSettingsLogic.h \
-    ui/pages_logic/NewServerProtocolsLogic.h \
-    ui/pages_logic/PageLogicBase.h \
-    ui/pages_logic/QrDecoderLogic.h \
-    ui/pages_logic/ServerConfiguringProgressLogic.h \
-    ui/pages_logic/ServerContainersLogic.h \
-    ui/pages_logic/ServerListLogic.h \
-    ui/pages_logic/ServerSettingsLogic.h \
-    ui/pages_logic/ShareConnectionLogic.h \
-    ui/pages_logic/SitesLogic.h \
-    ui/pages_logic/StartPageLogic.h \
-    ui/pages_logic/ViewConfigLogic.h \
-    ui/pages_logic/VpnLogic.h \
-    ui/pages_logic/WizardLogic.h \
-    ui/pages_logic/protocols/CloakLogic.h \
-    ui/pages_logic/protocols/OpenVpnLogic.h \
-    ui/pages_logic/protocols/OtherProtocolsLogic.h \
-    ui/pages_logic/protocols/PageProtocolLogicBase.h \
-    ui/pages_logic/protocols/ShadowSocksLogic.h \
-    ui/pages_logic/protocols/WireGuardLogic.h \
-    ui/property_helper.h \
-    ui/models/servers_model.h \
-    ui/uilogic.h \
-    ui/qautostart.h \
-    ui/models/sites_model.h \
-    utilities.h \
-    vpnconnection.h \
-    protocols/vpnprotocol.h \
-    constants.h \
-    platforms/ios/QRCodeReaderBase.h
-
-SOURCES  += \
-    amnezia_application.cpp \
-    configurators/cloak_configurator.cpp \
-    configurators/configurator_base.cpp \
-    configurators/ikev2_configurator.cpp \
-    configurators/shadowsocks_configurator.cpp \
-    configurators/ssh_configurator.cpp \
-    configurators/vpn_configurator.cpp \
-    configurators/wireguard_configurator.cpp \
-    containers/containers_defs.cpp \
-    core/errorstrings.cpp \
-    configurators/openvpn_configurator.cpp \
-    core/scripts_registry.cpp \
-    core/server_defs.cpp \
-    core/servercontroller.cpp \
-    logger.cpp \
-    main.cpp \
-    managementserver.cpp \
-    platforms/ios/MobileUtils.cpp \
-    platforms/linux/leakdetector.cpp \
-    protocols/protocols_defs.cpp \
-    secure_qsettings.cpp \
-    settings.cpp \
-    ui/notificationhandler.cpp \
-    ui/models/containers_model.cpp \
-    ui/models/protocols_model.cpp \
-    ui/pages_logic/AppSettingsLogic.cpp \
-    ui/pages_logic/GeneralSettingsLogic.cpp \
-    ui/pages_logic/NetworkSettingsLogic.cpp \
-    ui/pages_logic/NewServerProtocolsLogic.cpp \
-    ui/pages_logic/PageLogicBase.cpp \
-    ui/pages_logic/QrDecoderLogic.cpp \
-    ui/pages_logic/ServerConfiguringProgressLogic.cpp \
-    ui/pages_logic/ServerContainersLogic.cpp \
-    ui/pages_logic/ServerListLogic.cpp \
-    ui/pages_logic/ServerSettingsLogic.cpp \
-    ui/pages_logic/ShareConnectionLogic.cpp \
-    ui/pages_logic/SitesLogic.cpp \
-    ui/pages_logic/StartPageLogic.cpp \
-    ui/pages_logic/ViewConfigLogic.cpp \
-    ui/pages_logic/VpnLogic.cpp \
-    ui/pages_logic/WizardLogic.cpp \
-    ui/pages_logic/protocols/CloakLogic.cpp \
-    ui/pages_logic/protocols/OpenVpnLogic.cpp \
-    ui/pages_logic/protocols/OtherProtocolsLogic.cpp \
-    ui/pages_logic/protocols/PageProtocolLogicBase.cpp \
-    ui/pages_logic/protocols/ShadowSocksLogic.cpp \
-    ui/models/servers_model.cpp \
-    ui/pages_logic/protocols/WireGuardLogic.cpp \
-    ui/uilogic.cpp \
-    ui/qautostart.cpp \
-    ui/models/sites_model.cpp \
-    utilities.cpp \
-    vpnconnection.cpp \
-    protocols/vpnprotocol.cpp \
-    platforms/ios/QRCodeReaderBase.cpp
-
-RESOURCES += \
-    resources.qrc
-
-TRANSLATIONS = \
-    translations/amneziavpn_ru.ts
-
-win32 {
-    DEFINES += MVPN_WINDOWS
-
-    OTHER_FILES += platforms/windows/amneziavpn.rc
-    RC_FILE = platforms/windows/amneziavpn.rc
-
-    HEADERS += \
-       protocols/ikev2_vpn_protocol_windows.h \
-
-    SOURCES += \
-       protocols/ikev2_vpn_protocol_windows.cpp \
-
-    VERSION = 2.0.0.0
-    QMAKE_TARGET_COMPANY = "AmneziaVPN"
-    QMAKE_TARGET_PRODUCT = "AmneziaVPN"
-
-
-    LIBS += \
-        -luser32 \
-        -lrasapi32 \
-        -lshlwapi \
-        -liphlpapi \
-        -lws2_32 \
-        -lgdi32
-
-    QMAKE_LFLAGS_WINDOWS += /entry:mainCRTStartup
-
-   !contains(QMAKE_TARGET.arch, x86_64) {
-      message("Windows x86 build")
-      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto
-   }
-   else {
-      message("Windows x86_64 build")
-      LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto
-   }
-}
-
-macx {
-    DEFINES += MVPN_MACOS
-
-    ICON   = $$PWD/images/app.icns
-
-    HEADERS  += ui/macos_util.h
-    SOURCES  += ui/macos_util.mm
-
-    LIBS += -framework Cocoa -framework ApplicationServices -framework CoreServices -framework Foundation -framework AppKit -framework Security
-
-    LIBS += $$PWD/3rd/OpenSSL/lib/macos/x86_64/libcrypto.a
-    LIBS += $$PWD/3rd/OpenSSL/lib/macos/x86_64/libssl.a
-}
-
-linux:!android {
-    DEFINES += MVPN_LINUX
-    LIBS += /usr/lib/x86_64-linux-gnu/libcrypto.a
-    LIBS += /usr/lib/x86_64-linux-gnu/libssl.a
-
-    INCLUDEPATH += $$PWD/platforms/linux
-}
-
-win32|macx|linux:!android {
-   DEFINES += AMNEZIA_DESKTOP
-
-   HEADERS  += \
-      core/ipcclient.h \
-      core/privileged_process.h \
-      ui/systemtray_notificationhandler.h \
-      protocols/openvpnprotocol.h \
-      protocols/openvpnovercloakprotocol.h \
-      protocols/shadowsocksvpnprotocol.h \
-      protocols/wireguardprotocol.h \
-
-   SOURCES  += \
-      core/ipcclient.cpp \
-      core/privileged_process.cpp \
-      ui/systemtray_notificationhandler.cpp \
-      protocols/openvpnprotocol.cpp \
-      protocols/openvpnovercloakprotocol.cpp \
-      protocols/shadowsocksvpnprotocol.cpp \
-      protocols/wireguardprotocol.cpp \
-
-   REPC_REPLICA += ../ipc/ipc_interface.rep
-   REPC_REPLICA += ../ipc/ipc_process_interface.rep
-}
-
-android {
-    message(Platform: android)
-    message("$$ANDROID_TARGET_ARCH")
-    versionAtLeast(QT_VERSION, 6.0.0) {
-        # We need to include qtprivate api's
-        # As QAndroidBinder is not yet implemented with a public api
-        QT += core-private
-        ANDROID_ABIS = $$ANDROID_TARGET_ARCH
-    }
-
-   DEFINES += MVPN_ANDROID
-
-   INCLUDEPATH += platforms/android
-
-   HEADERS += \
-      platforms/android/android_controller.h \
-      platforms/android/android_notificationhandler.h \
-      protocols/android_vpnprotocol.h \
-      platforms/android/androidutils.h \
-      platforms/android/androidvpnactivity.h
-
-   SOURCES += \
-      platforms/android/android_controller.cpp \
-      platforms/android/android_notificationhandler.cpp \
-      protocols/android_vpnprotocol.cpp \
-      platforms/android/androidutils.cpp \
-      platforms/android/androidvpnactivity.cpp
-
-   DISTFILES += \
-      android/AndroidManifest.xml \
-      android/build.gradle \
-      android/gradle/wrapper/gradle-wrapper.jar \
-      android/gradle/wrapper/gradle-wrapper.properties \
-      android/gradlew \
-      android/gradlew.bat \
-      android/gradle.properties \
-      android/res/values/libs.xml \
-      android/res/xml/fileprovider.xml \
-      android/src/org/amnezia/vpn/AuthHelper.java \
-      android/src/org/amnezia/vpn/IPCContract.kt \
-      android/src/org/amnezia/vpn/NotificationUtil.kt \
-      android/src/org/amnezia/vpn/OpenVPNThreadv3.kt \
-      android/src/org/amnezia/vpn/Prefs.kt \
-      android/src/org/amnezia/vpn/VpnLogger.kt \
-      android/src/org/amnezia/vpn/VpnService.kt \
-      android/src/org/amnezia/vpn/VpnServiceBinder.kt \
-      android/src/org/amnezia/vpn/qt/AmneziaApp.kt \
-      android/src/org/amnezia/vpn/qt/PackageManagerHelper.java \
-      android/src/org/amnezia/vpn/qt/VPNActivity.kt \
-      android/src/org/amnezia/vpn/qt/VPNApplication.java \
-      android/src/org/amnezia/vpn/qt/VPNPermissionHelper.kt
-
-      ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-
-   for (abi, ANDROID_ABIS): {
-
-      equals(ANDROID_TARGET_ARCH,$$abi) {
-         LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
-         LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a
-      }
-
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so
-
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
-      ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so
-   }
-}
-
-ios {
-    message("Client iOS build")
-    CONFIG += static
-    CONFIG += file_copies
-
-    # For the authentication
-    LIBS += -framework AuthenticationServices
-
-    # For notifications
-    LIBS += -framework UIKit
-    LIBS += -framework Foundation
-    LIBS += -framework StoreKit
-    LIBS += -framework UserNotifications
-    LIBS += -framework AVFoundation
-
-    DEFINES += MVPN_IOS
-
-    HEADERS += \
-      protocols/ios_vpnprotocol.h \
-      platforms/ios/iosnotificationhandler.h \
-      platforms/ios/json.h \
-      platforms/ios/bigint.h \
-      platforms/ios/bigintipv6addr.h \
-      platforms/ios/ipaddress.h \
-      platforms/ios/ipaddressrange.h \
-      platforms/ios/QtAppDelegate.h \
-      platforms/ios/QtAppDelegate-C-Interface.h
-
-    SOURCES -= \
-      platforms/ios/QRCodeReaderBase.cpp \
-      platforms/ios/MobileUtils.cpp
-
-    SOURCES += \
-      protocols/ios_vpnprotocol.mm \
-      platforms/ios/iosnotificationhandler.mm \
-      platforms/ios/json.cpp \
-      platforms/ios/iosglue.mm \
-      platforms/ios/ipaddress.cpp \
-      platforms/ios/ipaddressrange.cpp \
-      platforms/ios/QRCodeReaderBase.mm \
-      platforms/ios/QtAppDelegate.mm \
-      platforms/ios/MobileUtils.mm
-
-    Q_ENABLE_BITCODE.value = NO
-    Q_ENABLE_BITCODE.name = ENABLE_BITCODE
-    QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
-
-#    CONFIG(iphoneos, iphoneos|iphonesimulator) {
-  iphoneos {
-    message("Building for iPhone OS")
-    QMAKE_TARGET_BUNDLE_PREFIX = org.amnezia
-    QMAKE_BUNDLE = AmneziaVPN
-    QMAKE_IOS_DEPLOYMENT_TARGET = 13.0
-    QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1
-    QMAKE_DEVELOPMENT_TEAM = X7UJ388FXK
-    QMAKE_PROVISIONING_PROFILE = f2fefb59-14aa-4aa9-ac14-1d5531b06dcc
-    QMAKE_XCODE_CODE_SIGN_IDENTITY = "Apple Distribution"
-    QMAKE_INFO_PLIST = $$PWD/ios/app/Info.plist
-
-    XCODEBUILD_FLAGS += -allowProvisioningUpdates
-
-    DEFINES += iphoneos
-
-    contains(QT_ARCH, arm64) {
-      message("Building for iOS/ARM v8 64-bit architecture")
-      ARCH_TAG = "ios_armv8_64"
-
-      LIBS += $$PWD/3rd/OpenSSL/lib/ios/iphone/libcrypto.a
-      LIBS += $$PWD/3rd/OpenSSL/lib/ios/iphone/libssl.a
-    } else {
-      message("Building for iOS/ARM v7 (32-bit) architecture")
-      ARCH_TAG = "ios_armv7"
-    }
-  }
-#    }
-
-
-#    CONFIG(iphonesimulator, iphoneos|iphonesimulator) {
-#  iphonesimulator {
-#    message("Building for iPhone Simulator")
-#    ARCH_TAG = "ios_x86_64"
-#
-#    DEFINES += iphonesimulator
-#
-#    LIBS += $$PWD/3rd/OpenSSL/lib/ios/simulator/libcrypto.a
-#    LIBS += $$PWD/3rd/OpenSSL/lib/ios/simulator/libssl.a
-#  }
-#    }
-
-    NETWORKEXTENSION=1
-#    ! build_pass: system(ruby $$PWD/scripts/xcode_patcher.rb "$$PWD" "$$OUT_PWD/AmneziaVPN.xcodeproj" "2.0" "2.0.0" "ios" "$$NETWORKEXTENSION"|| echo "Failed to merge xcode with wireguard")
-
-
-
-#ruby %{sourceDir}/client/ios/xcode_patcher.rb "%{buildDir}/AmneziaVPN.xcodeproj" "2.0" "2.0.0" "ios" "1"
-    #cd client/ && /Users/md/Qt/5.15.2/ios/bin/qmake -o Makefile /Users/md/amnezia/desktop-client/client/client.pro -spec macx-ios-clang CONFIG+=iphonesimulator CONFIG+=simulator CONFIG+=qml_debug -after
-# %{sourceDir}/client/ios/xcode_patcher.rb %{buildDir}/client/AmneziaVPN.xcodeproj 2.0 2.0.0 ios 1
-}
-
-
-

client/logger.cpp

@@ -9,7 +9,7 @@
 
 #include <iostream>
 
-#include "defines.h"
+#include "version.h"
 #include "utilities.h"
 
 #ifdef AMNEZIA_DESKTOP

client/main.cpp

@@ -3,7 +3,7 @@
 #include <QTimer>
 
 #include "amnezia_application.h"
-#include "defines.h"
+#include "version.h"
 
 #ifdef Q_OS_WIN
 #include "Windows.h"

client/platforms/windows/amneziavpn.rc.in

@@ -3,41 +3,33 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDI_ICON1               ICON                    "../../images/app.ico"
 
-#define VER_FILEVERSION             2,0,0,0
-#define VER_FILEVERSION_STR         "2.0.0.0\0"
-
-#define VER_PRODUCTVERSION          2,0,0,0
-#define VER_PRODUCTVERSION_STR      "2.0.0.0\0"
-
 #define VER_COMPANYNAME_STR         "AmneziaVPN"
-#define VER_FILEDESCRIPTION_STR     "AmneziaVPN"
+#define VER_FILEDESCRIPTION_STR     VER_COMPANYNAME_STR
-#define VER_INTERNALNAME_STR        "AmneziaVPN"
+#define VER_INTERNALNAME_STR        VER_COMPANYNAME_STR
 #define VER_LEGALCOPYRIGHT_STR      "AmneziaVPN."
 #define VER_LEGALTRADEMARKS1_STR    "All Rights Reserved"
 #define VER_LEGALTRADEMARKS2_STR    VER_LEGALTRADEMARKS1_STR
 #define VER_ORIGINALFILENAME_STR    "amneziavpn.exe"
-#define VER_PRODUCTNAME_STR         "AmneziaVPN"
+#define VER_PRODUCTNAME_STR         VER_COMPANYNAME_STR
-
-#define VER_COMPANYDOMAIN_STR       "https://amnezia.org/"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION VER_FILEVERSION
+FILEVERSION     @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@BUILD_ID@
-PRODUCTVERSION VER_PRODUCTVERSION
+PRODUCTVERSION  @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName",        VER_COMPANYNAME_STR
-            VALUE "FileDescription",    VER_FILEDESCRIPTION_STR
+            VALUE "FileDescription",    "@CMAKE_PROJECT_DESCRIPTION@"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        "@CMAKE_PROJECT_VERSION@"
             VALUE "InternalName",       VER_INTERNALNAME_STR
             VALUE "LegalCopyright",     VER_LEGALCOPYRIGHT_STR
             VALUE "LegalTrademarks1",   VER_LEGALTRADEMARKS1_STR
             VALUE "LegalTrademarks2",   VER_LEGALTRADEMARKS2_STR
             VALUE "OriginalFilename",   VER_ORIGINALFILENAME_STR
             VALUE "ProductName",        VER_PRODUCTNAME_STR
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     "@CMAKE_PROJECT_VERSION@"
         END
     END
 

client/protocols/openvpnprotocol.cpp

@@ -6,7 +6,7 @@
 #include <QRandomGenerator>
 
 #include "logger.h"
-#include "defines.h"
+#include "version.h"
 #include "utilities.h"
 #include "openvpnprotocol.h"
 

client/settings.cpp

@@ -1,4 +1,4 @@
-#include "defines.h"
+#include "version.h"
 #include "settings.h"
 #include "utilities.h"
 

client/ui/pages_logic/AppSettingsLogic.cpp

@@ -1,7 +1,7 @@
 #include "AppSettingsLogic.h"
 
 #include "logger.h"
-#include "defines.h"
+#include "version.h"
 #include "ui/qautostart.h"
 #include "ui/uilogic.h"
 
@@ -31,7 +31,7 @@ void AppSettingsLogic::onUpdatePage()
 
     QString ver = QString("%1: %2 (%3)")
             .arg(tr("Software version"))
-            .arg(QString(APP_MAJOR_VERSION))
+            .arg(QString(APP_VERSION))
             .arg(__DATE__);
     set_labelVersionText(ver);
 }

client/ui/pages_logic/NetworkSettingsLogic.cpp

@@ -1,6 +1,6 @@
 #include "NetworkSettingsLogic.h"
 
-#include "defines.h"
+#include "version.h"
 #include "utilities.h"
 #include "settings.h"
 

client/ui/pages_logic/ServerConfiguringProgressLogic.cpp

@@ -1,5 +1,5 @@
 #include "ServerConfiguringProgressLogic.h"
-#include "defines.h"
+#include "version.h"
 #include "core/errorstrings.h"
 #include <QTimer>
 #include <QEventLoop>

client/ui/pages_logic/ShareConnectionLogic.cpp

@@ -14,7 +14,7 @@
 #include "configurators/ikev2_configurator.h"
 #include "configurators/ssh_configurator.h"
 
-#include "defines.h"
+#include "version.h"
 #include "core/defs.h"
 #include "core/errorstrings.h"
 #include "core/servercontroller.h"

client/ui/pages_logic/VpnLogic.cpp

@@ -7,7 +7,7 @@
 #include <QTimer>
 #include <functional>
 #include "../uilogic.h"
-#include "defines.h"
+#include "version.h"
 #include <configurators/vpn_configurator.h>
 
 
@@ -88,7 +88,7 @@ void VpnLogic::onUpdatePage()
     else {
         set_labelErrorText("");
     }
-    QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
+    QString ver = QString("v. %2").arg(QString(APP_VERSION));
     set_labelVersionText(ver);
 
     set_labelLogEnabledVisible(m_settings->isSaveLogs());

client/ui/systemtray_notificationhandler.cpp

@@ -15,7 +15,7 @@
 #include <QIcon>
 #include <QWindow>
 
-#include "defines.h"
+#include "version.h"
 
 
 SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :

client/ui/uilogic.cpp

@@ -35,7 +35,7 @@
 #include "ui/qautostart.h"
 
 #include "logger.h"
-#include "defines.h"
+#include "version.h"
 #include "uilogic.h"
 #include "utilities.h"
 #include "vpnconnection.h"

client/utilities.cpp

@@ -8,7 +8,7 @@
 #include <QRegularExpression>
 #include <QStandardPaths>
 
-#include "defines.h"
+#include "version.h"
 #include "utilities.h"
 
 QString Utils::getRandomString(int len)

service/common.pri

@@ -1,10 +0,0 @@
-#exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtservice-uselib
-TEMPLATE += fakelib
-QTSERVICE_LIBNAME = QtSolutions_Service-head
-CONFIG(debug, debug|release) {
-	mac:QTSERVICE_LIBNAME = $$member(QTSERVICE_LIBNAME, 0)_debug
-   	else:win32:QTSERVICE_LIBNAME = $$member(QTSERVICE_LIBNAME, 0)d
-}
-TEMPLATE -= fakelib
-QTSERVICE_LIBDIR = $$PWD/lib
-unix:qtservice-uselib:!qtservice-buildlib:QMAKE_RPATHDIR += $$QTSERVICE_LIBDIR

service/server/CMakeLists.txt

@@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat)
 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

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"
 

service/service.pro

@@ -1,10 +0,0 @@
-!ios:!android {
-    TEMPLATE=subdirs
-    CONFIG += ordered
-    include(common.pri)
-    qtservice-uselib:SUBDIRS=buildlib
-    SUBDIRS+=server
-}
-win32 {
-    SUBDIRS+=wireguard-service
-}

service/src/qtservice.pri

@@ -1,21 +0,0 @@
-include(../common.pri)
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-!win32:QT += network
-win32:LIBS += -luser32
-
-qtservice-uselib:!qtservice-buildlib {
-    LIBS += -L$$QTSERVICE_LIBDIR -l$$QTSERVICE_LIBNAME
-} else {
-    HEADERS       += $$PWD/qtservice.h \
-                     $$PWD/qtservice_p.h
-    SOURCES       += $$PWD/qtservice.cpp
-    win32:SOURCES += $$PWD/qtservice_win.cpp
-    unix:HEADERS  += $$PWD/qtunixsocket.h $$PWD/qtunixserversocket.h
-    unix:SOURCES  += $$PWD/qtservice_unix.cpp $$PWD/qtunixsocket.cpp $$PWD/qtunixserversocket.cpp
-}
-
-win32 {
-    qtservice-buildlib:shared:DEFINES += QT_QTSERVICE_EXPORT
-    else:qtservice-uselib:DEFINES += QT_QTSERVICE_IMPORT
-}

service/wireguard-service/wireguard-service.pro

@@ -1,23 +0,0 @@
-TARGET   = wireguard-service
-TEMPLATE = app
-CONFIG   += console
-CONFIG -= app_bundle
-CONFIG -= qt
-LIBS += \
-        -luser32 \
-        -lrasapi32 \
-        -lshlwapi \
-        -liphlpapi \
-        -lws2_32 \
-        -liphlpapi \
-        -lgdi32 \
-        -lAdvapi32 \
-        -lKernel32
-
-HEADERS = \
-    wireguardtunnelservice.h
-
-SOURCES = \
-           main.cpp \
-           wireguardtunnelservice.cpp
-

version.h.in

@@ -1,10 +1,12 @@
-#ifndef DEFINES_H
+#ifndef VERSION_H
-#define DEFINES_H
+#define VERSION_H
+
+#ifndef APP_VERSION
+#define APP_VERSION "@CMAKE_PROJECT_VERSION@"
+#endif
 
 #define APPLICATION_NAME    "AmneziaVPN"
 #define SERVICE_NAME        "AmneziaVPN-service"
 #define ORGANIZATION_NAME   "AmneziaVPN.ORG"
-#define APP_MAJOR_VERSION   "2.1.2"
-#define APP_VERSION         "2.1.2.0"
 
-#endif // DEFINES_H
+#endif  // VERSION_H