feature/versioning-for-desktop (#181)

Project refactoring and cleanup

deploy/build_linux.sh

@@ -79,6 +79,8 @@ rm -f $INSTALLER_DATA_DIR/data.7z
 
 ldd $CQTDEPLOYER_DIR/bin/binarycreator
 
-$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $PROJECT_DIR/deploy/installer/config/linux.xml -p $PROJECT_DIR/deploy/installer/packages/ -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer
+cp -r $PROJECT_DIR/deploy/installer $BUILD_DIR
+
+$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer
 
 

deploy/installer/config.cmake

@@ -0,0 +1,23 @@
+if(WIN32)
+    set(RootDir "@RootDir@")
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/windows.xml.in
+        ${CMAKE_BINARY_DIR}/installer/config/windows.xml
+    )
+elseif(APPLE AND NOT IOS)
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/macos.xml.in
+        ${CMAKE_BINARY_DIR}/installer/config/macos.xml
+    )
+elseif(LINUX)
+    set(ApplicationsDir "@ApplicationsDir@")
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in
+        ${CMAKE_BINARY_DIR}/installer/config/linux.xml
+    )
+endif()
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/packages/org.amneziavpn.package/meta/package.xml.in
+    ${CMAKE_BINARY_DIR}/installer/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>
-       <Url>https://amneziavpn.org/updates/linux</Url>
-       <Enabled>true</Enabled>
-       <DisplayName>AmneziaVPN - repository for Linux</DisplayName>
-     </Repository>
+        <Repository>
+            <Url>https://amneziavpn.org/updates/linux</Url>
+            <Enabled>true</Enabled>
+            <DisplayName>AmneziaVPN - repository for Linux</DisplayName>
+        </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>
-       <Url>https://amneziavpn.org/updates/macos</Url>
-       <Enabled>true</Enabled>
-       <DisplayName>AmneziaVPN - repository for macOS</DisplayName>
-     </Repository>
+        <Repository>
+            <Url>https://amneziavpn.org/updates/macos</Url>
+            <Enabled>true</Enabled>
+            <DisplayName>AmneziaVPN - repository for macOS</DisplayName>
+        </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>
-    <ReleaseDate>2022-02-02</ReleaseDate>
+    <Version>@CMAKE_PROJECT_VERSION@</Version>
+    <ReleaseDate>@RELEASE_DATE@</ReleaseDate>
     <Default>true</Default>
     <ForcedInstallation>true</ForcedInstallation>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>componentscript.js</Script>
 </Package>
-