next try arm msi

ConSol-Monitoring · May 2, 2024 · fef9b27 · fef9b27
1 parent 1750b63
commit fef9b27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packaging/windows/build_msi.ps1 b/packaging/windows/build_msi.ps1
@@ -28,6 +28,7 @@ if ("$arch" -eq "aarch64") { $win_arch = "arm64"; $go_arch = "arm64" }
 
 Copy-Item .\windist\windows_exporter-$go_arch.exe .\windist\windows_exporter.exe
 
+Write-Output "using: arch / platform: $win_arch"
 & 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe' .\packaging\windows\snclient.wxs `
   -arch $win_arch `
   -dPlatform="$win_arch" `

diff --git a/packaging/windows/snclient.wxs b/packaging/windows/snclient.wxs
@@ -2,15 +2,15 @@
 <?if $(var.Platform) = x64 ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?define Win64 = 'yes' ?>
-  <?define InstallerVersion = '200' ?>
-<?elsif $(var.Platform) ~= "Arm64" ?>
+  <?define InstallerVersion = "200" ?>
+<?elseif $(var.Platform) = arm64 ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?define Win64 = 'yes' ?>
-  <?define InstallerVersion = '500' ?>
+  <?define InstallerVersion = "500" ?>
 <?else?>
   <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?define Win64 = "no" ?>
-  <?define InstallerVersion = '200' ?>
+  <?define InstallerVersion = "200" ?>
 <?endif?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Name="SNClient+" Id="*" UpgradeCode="F4BF03F6-D3DA-44FF-A444-9B64119DA0CE" Language="1033" Codepage="1252" Version="$(var.MajorVersion).$(var.MinorVersion).$(var.RevisionNumber)" Manufacturer="ConSol Consulting &amp; Solutions Software GmbH">