From 94640a992b0c02223ff329e217ac80d8d565499a Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 22 Aug 2023 15:05:24 +0300
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFUpdate=20build=20instructions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

WE2-816, WE2-815, Fixes #283

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 CMakeLists.txt         |  2 +-
 README.md              |  2 ++
 install/web-eid.wxs    | 33 ++++++++++-----------------------
 src/app/CMakeLists.txt |  3 +--
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6426a160..f891cd08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.4.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.5.0.${BUILD_NUMBER})
 
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK})
diff --git a/README.md b/README.md
index af619bb4..cbd2eae6 100644
--- a/README.md
+++ b/README.md
@@ -326,6 +326,8 @@ Use _Powershell_ to run the following commands to build the project.
 
 - Run _CMake_:
 
+Optionally, WIX Toolset v3 is required for the installer, and the WIX environment variable should be set for the installed target.
+
       cmake "-DCMAKE_PREFIX_PATH=${QT_ROOT}" `
           "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
           "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" -A x64 -B build -S .
diff --git a/install/web-eid.wxs b/install/web-eid.wxs
index 93e7becc..de2e21ae 100644
--- a/install/web-eid.wxs
+++ b/install/web-eid.wxs
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<?ifndef Platform ?>
-<?define Platform="x64" ?>
-<?endif ?>
-
 <?ifndef qt_suffix ?>
 <?define qt_suffix="" ?>
 <?endif ?>
@@ -16,7 +12,7 @@
 <?define VCVER = "141" ?>
 <?endif?>
 
-<?if $(var.Platform) = x64 ?>
+<?if $(sys.BUILDARCH) = x64 ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?define ssl_suffix = "-x64" ?>
 <?else ?>
@@ -25,15 +21,15 @@
 <?endif ?>
 
 <?if $(var.qt_suffix) = "d" ?>
-<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\Debug_NonRedist\$(var.Platform)\Microsoft.VC$(var.VCVER).DebugCRT" ?>
+<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\Debug_NonRedist\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).DebugCRT" ?>
 <?else ?>
-<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\$(var.Platform)\Microsoft.VC$(var.VCVER).CRT" ?>
+<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).CRT" ?>
 <?endif ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product Name="Web eID software" UpgradeCode="4f0e0fef-0dbc-481b-9d81-08921740f781"
       Id="*" Language="1033" Version="$(var.MSI_VERSION)" Codepage="1251" Manufacturer="RIA">
-    <Package Platform="$(var.Platform)" Keywords="Installer" InstallerVersion="405" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated"/>
+    <Package Keywords="Installer" InstallerVersion="405" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated"/>
     <MediaTemplate EmbedCab="yes" CompressionLevel="high"/>
     <Icon Id="web_eid.exe" SourceFile="$(var.app_path)"/>
     <Property Id="ARPPRODUCTICON" Value="web_eid.exe"/>
@@ -85,26 +81,21 @@
 <?ifdef var.qt_path ?>
             <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll"/>
             <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll"/>
-<?if $(var.Platform) = x64 AND $(env.VisualStudioVersion) = "16.0" ?>
+<?if $(sys.BUILDARCH) = x64 AND $(env.VisualStudioVersion) != "15.0" ?>
             <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll"/>
             <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll"/>
             <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll"/>
 <?endif?>
             <File Source="$(var.ssl_path)\libcrypto-3$(var.ssl_suffix).dll"/>
             <File Source="$(var.ssl_path)\libssl-3$(var.ssl_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_version_major)Core$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_version_major)Gui$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_version_major)Network$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_version_major)Svg$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_version_major)Widgets$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Core$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Gui$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll"/>
             <File Source="$(var.qt_path)\D3DCompiler_47.dll"/>
             <File Source="$(var.qt_path)\opengl32sw.dll" />
-<?if $(var.qt_version_major) = "5" ?>
-            <File Source="$(var.qt_path)\libEGL$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\libGLESv2$(var.qt_suffix).dll"/>
-<?else ?>
             <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll"/>
-<?endif?>
 <?endif?>
           </Component>
           <Component Id="ChromeEdge" Transitive="yes">
@@ -135,13 +126,11 @@
               <File Name="qsvg$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
-<?if $(var.qt_version_major) = "6" ?>
           <Directory Id="tls" Name="tls" FileSource="$(var.qt_path)\..\plugins\tls">
             <Component Id="qopensslbackend.dll">
               <File Name="qopensslbackend$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
-<?endif?>
 <?endif?>
         </Directory>
       </Directory>
@@ -191,9 +180,7 @@
       <ComponentRef Id="qwindows.dll" />
       <ComponentRef Id="qwindowsvistastyle.dll" />
       <ComponentRef Id="imageformats.dll" />
-<?if $(var.qt_version_major) = "6" ?>
       <ComponentRef Id="qopensslbackend.dll" />
-<?endif?>
 <?endif?>
     </Feature>
   </Product>
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index fdc9e308..84f33e72 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -29,7 +29,6 @@ if(WIN32)
     set(BASE_FILE $<TARGET_NAME:web-eid>_${PROJECT_VERSION}.${PLATFORM})
     list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM}
         -dMSI_VERSION=${PROJECT_VERSION}
-        -dPlatform=${PLATFORM}
         -dssl_path="${SSL_PATH}"
         -dqt_suffix="$<$<CONFIG:Debug>:d>"
         -djson=${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
@@ -49,7 +48,7 @@ if(WIN32)
         COMMAND ${CANDLE_CMD}
         COMMAND ${LIGHT_CMD} -o "${BASE_FILE}.msi"
         #Build MSI with QT
-        COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix} -dqt_version_major=${QT_VERSION_MAJOR}
+        COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix}
         COMMAND ${LIGHT_CMD} -o "${BASE_FILE}.qt.msi"
         WORKING_DIRECTORY $<TARGET_FILE_DIR:web-eid>
     )