added dependency of the version in the installer on the version in CMakeLists

CMakeLists.txt

@@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-set(BUILD_ID 1)
+project(${PROJECT} VERSION 2.1.2.0
-project(${PROJECT} VERSION 2.1.2 
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
+set(RELEASE_DATE "09.03.2023")
+set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 if(ANDROID)
     set(QT_ANDROID_BUILD_ALL_ABIS ON)
@@ -16,4 +17,6 @@ add_subdirectory(client)
 
 if(NOT IOS AND NOT ANDROID)
     add_subdirectory(service)
+
+    include(${CMAKE_SOURCE_DIR}/deploy/installer/config.cmake)
 endif()

client/CMakeLists.txt

@@ -407,15 +407,15 @@ if(IOS)
         MACOSX_BUNDLE ON
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/ios/app/Info.plist.in
         MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPN"
-        MACOSX_BUNDLE_BUNDLE_VERSION "${BUILD_ID}"
+        MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
         MACOSX_BUNDLE_COPYRIGHT "MPL-2.0"
         MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
         MACOSX_BUNDLE_INFO_STRING "AmneziaVPN"
-        MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_PROJECT_VERSION}-${BUILD_ID}"
+        MACOSX_BUNDLE_LONG_VERSION_STRING "${APP_MAJOR_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION}"
+        MACOSX_BUNDLE_SHORT_VERSION_STRING "${APP_MAJOR_VERSION}"
         XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
         XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/ios/app/main.entitlements"
-        XCODE_ATTRIBUTE_MARKETING_VERSION "${CMAKE_PROJECT_VERSION}"
+        XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}"
         XCODE_GENERATE_SCHEME TRUE
         MACOSX_BUNDLE_ICON_FILE "AppIcon"
     )

client/platforms/windows/amneziavpn.rc.in

@@ -13,7 +13,7 @@ IDI_ICON1               ICON                    "../../images/app.ico"
 #define VER_PRODUCTNAME_STR         VER_COMPANYNAME_STR
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@BUILD_ID@
+FILEVERSION     @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
 PRODUCTVERSION  @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@
 BEGIN
     BLOCK "StringFileInfo"

client/ui/pages_logic/AppSettingsLogic.cpp

@@ -31,7 +31,7 @@ void AppSettingsLogic::onUpdatePage()
 
     QString ver = QString("%1: %2 (%3)")
             .arg(tr("Software version"))
-            .arg(QString(APP_VERSION))
+            .arg(QString(APP_MAJOR_VERSION))
             .arg(__DATE__);
     set_labelVersionText(ver);
 }

client/ui/pages_logic/VpnLogic.cpp

@@ -88,7 +88,7 @@ void VpnLogic::onUpdatePage()
     else {
         set_labelErrorText("");
     }
-    QString ver = QString("v. %2").arg(QString(APP_VERSION));
+    QString ver = QString("v. %2").arg(QString(APP_MAJOR_VERSION));
     set_labelVersionText(ver);
 
     set_labelLogEnabledVisible(m_settings->isSaveLogs());

deploy/installer/config.cmake

@@ -0,0 +1,23 @@
+if(WIN32)
+    set(RootDir "@RootDir@")
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/windows.xml.in
+        ${CMAKE_CURRENT_LIST_DIR}/config/windows.xml
+    )
+elseif(APPLE AND NOT IOS)
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/macos.xml.in
+        ${CMAKE_CURRENT_LIST_DIR}/config/macos.xml
+    )
+elseif(LINUX)
+    set(ApplicationsDir "@ApplicationsDir@")
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in
+        ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml
+    )
+endif()
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/packages/org.amneziavpn.package/meta/package.xml.in
+    ${CMAKE_CURRENT_LIST_DIR}/packages/org.amneziavpn.package/meta/package.xml
+)

deploy/installer/config/linux.xml.in

@@ -18,10 +18,10 @@
     <SupportsModify>false</SupportsModify>
     <DisableAuthorizationFallback>true</DisableAuthorizationFallback>
     <RemoteRepositories>
-     <Repository>
+        <Repository>
-       <Url>https://amneziavpn.org/updates/linux</Url>
+            <Url>https://amneziavpn.org/updates/linux</Url>
-       <Enabled>true</Enabled>
+            <Enabled>true</Enabled>
-       <DisplayName>AmneziaVPN - repository for Linux</DisplayName>
+            <DisplayName>AmneziaVPN - repository for Linux</DisplayName>
-     </Repository>
+        </Repository>
     </RemoteRepositories>
 </Installer>

deploy/installer/config/macos.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>AmneziaVPN</Name>
-    <Version>1.6.0.0</Version>
+    <Version>@CMAKE_PROJECT_VERSION@</Version>
     <Title>AmneziaVPN</Title>
     <Publisher>AmneziaVPN</Publisher>
     <StartMenuDir>AmneziaVPN</StartMenuDir>
@@ -18,10 +18,10 @@
     <SupportsModify>false</SupportsModify>
     <DisableAuthorizationFallback>true</DisableAuthorizationFallback>
     <RemoteRepositories>
-     <Repository>
+        <Repository>
-       <Url>https://amneziavpn.org/updates/macos</Url>
+            <Url>https://amneziavpn.org/updates/macos</Url>
-       <Enabled>true</Enabled>
+            <Enabled>true</Enabled>
-       <DisplayName>AmneziaVPN - repository for macOS</DisplayName>
+            <DisplayName>AmneziaVPN - repository for macOS</DisplayName>
-     </Repository>
+        </Repository>
     </RemoteRepositories>
 </Installer>

deploy/installer/config/windows.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>AmneziaVPN</Name>
-    <Version>2.0.0.0</Version>
+    <Version>@CMAKE_PROJECT_VERSION@</Version>
     <Title>AmneziaVPN</Title>
     <Publisher>AmneziaVPN</Publisher>
     <StartMenuDir>AmneziaVPN</StartMenuDir>

deploy/installer/packages/org.amneziavpn.package/meta/package.xml.in

@@ -2,11 +2,10 @@
 <Package>
     <DisplayName>AmneziaVPN</DisplayName>
     <Description>Installation package for AmneziaVPN</Description>
-    <Version>2.0.0.0</Version>
+    <Version>@CMAKE_PROJECT_VERSION@</Version>
-    <ReleaseDate>2022-02-02</ReleaseDate>
+    <ReleaseDate>@RELEASE_DATE@</ReleaseDate>
     <Default>true</Default>
     <ForcedInstallation>true</ForcedInstallation>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>componentscript.js</Script>
 </Package>
-

version.h.in

@@ -5,6 +5,10 @@
 #define APP_VERSION "@CMAKE_PROJECT_VERSION@"
 #endif
 
+#ifndef APP_MAJOR_VERSION
+#define APP_MAJOR_VERSION "@APP_MAJOR_VERSION@"
+#endif
+
 #define APPLICATION_NAME    "AmneziaVPN"
 #define SERVICE_NAME        "AmneziaVPN-service"
 #define ORGANIZATION_NAME   "AmneziaVPN.ORG"