Windows arm64

IB-6662

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.github/workflows/build.yml

@@ -23,50 +23,48 @@ jobs:
         path: build/*.pkg
   windows:
     name: Build on Windows
-    runs-on: windows-2025
+    runs-on: ${{ matrix.platform == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     strategy:
       matrix:
         vcver: [143]
+        platform: [x64, arm64]
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
     - name: Checkout
       uses: actions/checkout@v5
       with:
         submodules: recursive
-    - name: Cache vcpkg
-      uses: actions/cache@v4
-      with:
-        path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.vcver }}-${{ hashFiles('vcpkg.json') }}
-    - name: Prepare vcpkg
-      uses: lukka/run-vcpkg@v11 
-      with:
-        vcpkgJsonGlob: ./vcpkg.json
-        runVcpkgInstall: true
-      env:
-        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
-        VCPKG_INSTALLED_DIR: ${{ github.workspace }}/build/vcpkg_installed
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.10.0
-        arch: win64_msvc2022_64
+        version: 6.10.1
+        arch: ${{ matrix.platform == 'arm64' && 'win64_msvc2022_arm64' || 'win64_msvc2022_64' }}
+        cache: true
+        cache-key-prefix: qt-6.10.1-${{ matrix.platform }}
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
       with:
-        arch: x64
+        arch: ${{ matrix.platform }}
     - name: Install WiX
       run: |
         dotnet tool install -g wix --version 6.0.2
         wix extension -g add WixToolset.UI.wixext/6.0.2
+    - name: Cache vcpkg
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/vcpkg_cache
+        key: vcpkg-${{ matrix.vcver }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }}
     - name: Build
+      env:
+        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
       run: |
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+        cmake -A ${{ matrix.platform }} -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.platform }}-windows
         cmake --build build --target installer
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: msi_${{ matrix.vcver }}_x64
+        name: msi_${{ matrix.vcver }}_${{ matrix.platform }}
         path: build/*.msi

CMakeLists.txt

@@ -150,6 +150,8 @@ else()
 
 	find_package(OpenSSL 3.0.0 REQUIRED)
 	find_package(Qt6 6.0.0 REQUIRED COMPONENTS Core Widgets Network LinguistTools)
+	message("VC Tools Dir: ${VCToolsInstallDir}")
+	message("VC Version:   ${VCToolsVersion}")
 
 	add_executable(${PROJECT_NAME} WIN32
 		${SOURCES}
@@ -201,12 +203,12 @@ else()
 	if(NOT EXISTS "${SSL_PATH}")
 		get_filename_component(SSL_PATH "${OPENSSL_INCLUDE_DIR}/../bin" ABSOLUTE)
 	endif()
-	set(MSI_FILE "ID-Updater-${VERSION}$ENV{VER_SUFFIX}.$ENV{PLATFORM}")
+	set(MSI_FILE "ID-Updater-${VERSION}$ENV{VER_SUFFIX}.${MSVC_CXX_ARCHITECTURE_ID}")
 	get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION)
 	get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
 	add_custom_target(installer DEPENDS ${PROJECT_NAME}
 		COMMAND wix.exe build -nologo
-			-arch $ENV{PLATFORM}
+			-arch ${MSVC_CXX_ARCHITECTURE_ID}
 			-ext WixToolset.UI.wixext
 			-bv WixUIDialogBmp=${CMAKE_SOURCE_DIR}/common/dlgbmp.bmp
 			-bv WixUIBannerBmp=${CMAKE_SOURCE_DIR}/common/banner.bmp

ScheduledUpdateTask.cpp

@@ -32,15 +32,13 @@
 #endif
 
 template <class T>
-class CPtr
+struct CPtr
 {
-	T *d;
- public:
-	CPtr(T *p = nullptr): d(p) {}
-	~CPtr() { if(d) d->Release(); }
-	inline T* operator->() const { return d; }
-	inline operator T*() const { return d; }
-	inline T** operator&() { return &d; }
+    T *d{};
+    ~CPtr() { if(d) d->Release(); }
+    inline T* operator->() const { return d; }
+    inline operator T*() const { return d; }
+    inline T** operator&() { return &d; }
 };
 
 class ScheduledUpdateTaskPrivate
@@ -79,8 +77,8 @@ bool ScheduledUpdateTask::configure(ScheduledUpdateTask::Interval interval)
 	if( FAILED(d->service->NewTask( 0, &task )) )
 		return false;
 
-	CPtr<ITaskSettings> settings;
-	if( SUCCEEDED(task->get_Settings( &settings )) )
+	if(CPtr<ITaskSettings> settings;
+		SUCCEEDED(task->get_Settings(&settings)))
 	{
 		settings->put_StartWhenAvailable(VARIANT_TRUE);
 		settings->put_RunOnlyIfNetworkAvailable(VARIANT_TRUE);

idupdater.wxs

@@ -1,7 +1,7 @@
-<?if $(sys.BUILDARCH) = x64 ?>
-  <?define OpenSSLSuffix = "-x64" ?>
-<?else?>
+<?if $(sys.BUILDARCH) = x86 ?>
   <?define OpenSSLSuffix = "" ?>
+<?else?>
+  <?define OpenSSLSuffix = "-$(sys.BUILDARCH)" ?>
 <?endif?>
 
 <?if $(env.VisualStudioVersion) = "17.0" ?>
@@ -18,7 +18,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Name="Open-EID Updater" UpgradeCode="d3aa8bd7-e1e6-46d0-97a6-c9b87d2b830b"
+  <Package Name="Open-EID Updater $(sys.BUILDARCH)" UpgradeCode="d3aa8bd7-e1e6-46d0-97a6-c9b87d2b830b"
       Language="1033" Version="!(bind.FileVersion.id_updater.exe)" Codepage="1251" Manufacturer="RIA" InstallerVersion="500">
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <Icon Id="appicon.ico" SourceFile="$(var.appicon)" />
@@ -35,7 +35,7 @@
           <File Id="id_updater.exe" Source="$(var.updater_path)" KeyPath="yes" />
           <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\Open-EID"
             Name="Installed" Value="[INSTALLFOLDER]" Type="string" />
-<?if $(sys.BUILDARCH) = x64 ?>
+<?if $(sys.BUILDARCH) != x86 ?>
           <RegistryValue Root="HKMU" Key="Software\Wow6432Node\[Manufacturer]\Open-EID"
             Name="Installed" Value="[INSTALLFOLDER]" Type="string" />
 <?endif?>
@@ -55,21 +55,15 @@
         <File Name="Qt6PrintSupport$(var.qt_suffix).dll" />
         <File Name="Qt6Svg$(var.qt_suffix).dll" />
         <File Name="Qt6Widgets$(var.qt_suffix).dll" />
+        <File Name="Qt6SvgWidgets$(var.qt_suffix).dll" />
+<?if $(sys.BUILDARCH) != arm64 ?>
         <File Name="D3DCompiler_47.dll" />
         <File Name="opengl32sw.dll" />
-        <File Name="Qt6SvgWidgets$(var.qt_suffix).dll" />
-        <Directory Id="platforms" Name="platforms">
-          <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="tls" Name="tls">
-          <File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="styles" Name="styles">
-          <File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="imageformats" Name="imageformats">
-          <File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
-        </Directory>
+<?endif?>
+        <File Subdirectory="platforms" Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
+        <File Subdirectory="tls" Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
+        <File Subdirectory="styles" Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
+        <File Subdirectory="imageformats" Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
       </Directory>
     </StandardDirectory>