Build arm64 package with python support

IB-8503

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

Author: metsma

.github/workflows/build.yml

@@ -93,7 +93,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.target }}-${{ hashFiles('.github/workflows/*', 'vcpkg.json', 'vcpkg-ports/**', 'CMakeLists.txt', '**/CMakeLists.txt', 'CMakePresets.json') }}
+        key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json', 'vcpkg-ports/**') }}
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
@@ -181,10 +181,13 @@ jobs:
         include:
         - platform: x86
           setenv: amd64_x86
+          python: 32
         - platform: x64
           setenv: amd64
+          python: 64
         - platform: arm64
           setenv: amd64_arm64
+          python: arm64
     env:
       VER_SUFFIX: .VS${{ matrix.toolset }}
       CXXFLAGS: '/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR' # https://github.com/actions/runner-images/issues/10004
@@ -195,7 +198,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.toolset }}-${{ matrix.platform }}-${{ hashFiles('.github/workflows/*', 'vcpkg.json', 'vcpkg-ports/**', 'CMakeLists.txt', '**/CMakeLists.txt', 'CMakePresets.json') }}
+        key: vcpkg-${{ matrix.toolset }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json', 'vcpkg-ports/**') }}
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
@@ -207,23 +210,20 @@ jobs:
         VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows
         VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed_${{ matrix.platform }}
     - name: Install dependencies
-      run: winget install --silent --accept-source-agreements --accept-package-agreements swig doxygen
+      run: winget install --silent --accept-source-agreements --accept-package-agreements swig doxygen 9NQ7512CXL7T
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: actions/setup-python@v5
-      if: matrix.platform != 'arm64'
-      with:
-        python-version: 3.12
-        architecture: ${{ matrix.platform }}
     - name: Build
       run: |
+        & "$env:LOCALAPPDATA\Microsoft\WindowsApps\py.exe" install --target=.\python\${{ matrix.platform }} 3.12-${{ matrix.python }}
         $swig = (Get-Item "$env:LOCALAPPDATA\Microsoft\WinGet\Links\swig.exe").Target
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" ${{ matrix.setenv }} "&&" pwsh build.ps1 `
           -swig $swig `
           -doxygen "C:/Program files/doxygen/bin/doxygen.exe" `
-          -boost
+          -boost `
+          -python ${{ github.workspace }}/python
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:

build.ps1

@@ -16,7 +16,8 @@ param(
   [string]$swig = $null,
   [string]$doxygen = $null,
   [switch]$boost = $false,
-  [string]$sign = $null
+  [string]$sign = $null,
+  [string]$python = $null
 )
 
 Try {
@@ -43,14 +44,16 @@ if($doxygen) {
   $cmakeext += "-DDOXYGEN_EXECUTABLE=$doxygen"
 }
 if($platform -eq "arm64" -and $env:VSCMD_ARG_HOST_ARCH -ne "arm64") {
-  $cmakeext += "-DCMAKE_DISABLE_FIND_PACKAGE_Python3=yes"
-  $wixext += "-d", "disablePython=1"
   $boost = $false
 }
 if($boost) {
   $cmakeext += "-DVCPKG_MANIFEST_FEATURES=tests"
   $target += "check"
 }
+if($python) {
+  $cmakeext += "-DPython3_ROOT_DIR=$python/$platform"
+  $wixext += "-d", "python=1"
+}
 
 foreach($type in @("Debug", "RelWithDebInfo")) {
   $buildpath = $platform+$type

libdigidocpp.wxs

@@ -64,7 +64,7 @@
       <File Name="digidoc_csharp.dll" />
       <File Name="digidoc_java.dll" />
       <File Source="$(var.libdigidocpp)\share\digidocpp\digidocpp.jar" />
-<?ifndef var.disablePython ?>
+<?ifdef var.python ?>
       <File Name="_digidoc_python.pyd" />
       <File Name="digidoc.py" />
 <?endif?>
@@ -88,7 +88,7 @@
 <?ifdef var.swig ?>
       <File Name="digidoc_csharpd.dll" />
       <File Name="digidoc_javad.dll" />
-<?ifndef var.disablePython ?>
+<?ifdef var.python ?>
       <File Name="_digidoc_pythond.pyd" />
 <?endif?>
 <?endif?>