diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-11-09 10:19:18 +0100 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-13 14:42:54 +0100 |
| commit | 23e7c90417acaa8e7773ef822391e80dad508e5b (patch) | |
| tree | 1cc5473131f6d58556a9c08a4f84fcaf279b1f1a /installer | |
| parent | build: bump wireguard-tools for mingw improvements (diff) | |
| download | wireguard-windows-23e7c90417acaa8e7773ef822391e80dad508e5b.tar.xz wireguard-windows-23e7c90417acaa8e7773ef822391e80dad508e5b.zip | |
installer: enable ARM MSI building
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/.gitignore | 1 | ||||
| -rw-r--r-- | installer/build.bat | 2 | ||||
| -rw-r--r-- | installer/wireguard.wxs | 10 |
3 files changed, 9 insertions, 4 deletions
diff --git a/installer/.gitignore b/installer/.gitignore index 2933d030..3b5ee366 100644 --- a/installer/.gitignore +++ b/installer/.gitignore @@ -5,3 +5,4 @@ /dist /x86 /amd64 +/arm diff --git a/installer/build.bat b/installer/build.bat index c4b49fdb..f7ac7246 100644 --- a/installer/build.bat +++ b/installer/build.bat @@ -12,6 +12,7 @@ set WIREGUARD_VERSION=%WIREGUARD_VERSION:"=% set WIX_CANDLE_FLAGS=-nologo -dWIREGUARD_VERSION="%WIREGUARD_VERSION%" set WIX_LIGHT_FLAGS=-nologo -spdb +set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE39 set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE61 if exist .deps\prepared goto :build @@ -36,6 +37,7 @@ if exist .deps\prepared goto :build set LDLIBS=-lmsi -lole32 -lshlwapi -lshell32 -luuid call :msi x86 i686 x86 || goto :error call :msi amd64 x86_64 x64 || goto :error + call :msi arm armv7 arm || goto :error if exist ..\sign.bat call ..\sign.bat if "%SigningCertificate%"=="" goto :success if "%TimestampServer%"=="" goto :success diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs index f45a071c..85e09e08 100644 --- a/installer/wireguard.wxs +++ b/installer/wireguard.wxs @@ -5,15 +5,17 @@ Copyright (C) 2019 WireGuard LLC. All Rights Reserved. --> -<?if $(var.WIREGUARD_PLATFORM) = "x86"?> - <?define PlatformProgramFilesFolder = "ProgramFilesFolder"?> -<?else?> +<?if $(var.WIREGUARD_PLATFORM) = "amd64"?> <?define PlatformProgramFilesFolder = "ProgramFiles64Folder"?> +<?else?> + <?define PlatformProgramFilesFolder = "ProgramFilesFolder"?> <?endif?> <?if $(var.WIREGUARD_PLATFORM) = "amd64"?> <?define UpgradeCode = "5e5a1da5-ba36-404d-92ec-41050d1c799c"?> <?elseif $(var.WIREGUARD_PLATFORM) = "x86"?> <?define UpgradeCode = "62754a0a-fee9-4412-b739-e8da2e7c9405"?> +<?elseif $(var.WIREGUARD_PLATFORM) = "arm"?> + <?define UpgradeCode = "f90bca59-9627-431d-92b4-a5c2d9a529ff"?> <?else?> <?error Unknown platform ?> <?endif?> @@ -27,7 +29,7 @@ Manufacturer="WireGuard LLC" UpgradeCode="$(var.UpgradeCode)"> <Package - InstallerVersion="400" + InstallerVersion="500" Compressed="yes" InstallScope="perMachine" Description="WireGuard: Fast, Modern, Secure VPN Tunnel" |