diff options
author | Simon Rozman <simon@rozman.si> | 2020-11-09 15:38:10 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-13 14:42:54 +0100 |
commit | 22647958aee9828ecdd16f09e3a1bdf6b606578f (patch) | |
tree | 40dea82c966d1e33fe35b57cf653bf2c66ece234 /installer | |
parent | build: make arm64 binary by copying arm binary (diff) | |
download | wireguard-windows-22647958aee9828ecdd16f09e3a1bdf6b606578f.tar.xz wireguard-windows-22647958aee9828ecdd16f09e3a1bdf6b606578f.zip |
installer: updater: introduce ARM64 MSI packages
Windows 10 ARM64 refuses to install ARM MSI.
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'installer')
-rw-r--r-- | installer/.gitignore | 1 | ||||
-rw-r--r-- | installer/build.bat | 3 | ||||
-rw-r--r-- | installer/wireguard.wxs | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/installer/.gitignore b/installer/.gitignore index 3b5ee366..fc4d2127 100644 --- a/installer/.gitignore +++ b/installer/.gitignore @@ -6,3 +6,4 @@ /x86 /amd64 /arm +/arm64 diff --git a/installer/build.bat b/installer/build.bat index f7ac7246..ae8a24e3 100644 --- a/installer/build.bat +++ b/installer/build.bat @@ -20,7 +20,7 @@ if exist .deps\prepared goto :build rmdir /s /q .deps 2> NUL mkdir .deps || goto :error cd .deps || goto :error - call :download wix-binaries.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip 2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e || goto :error + call :download wix-binaries.zip https://wixtoolset.org/downloads/v3.14.0.4118/wix314-binaries.zip 34dcbba9952902bfb710161bd45ee2e721ffa878db99f738285a21c9b09c6edb || goto :error echo [+] Extracting wix-binaries.zip mkdir wix\bin || goto :error tar -xf wix-binaries.zip -C wix\bin || goto :error @@ -38,6 +38,7 @@ if exist .deps\prepared goto :build call :msi x86 i686 x86 || goto :error call :msi amd64 x86_64 x64 || goto :error call :msi arm armv7 arm || goto :error + call :msi arm64 aarch64 arm64 || 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 85e09e08..56d00163 100644 --- a/installer/wireguard.wxs +++ b/installer/wireguard.wxs @@ -5,7 +5,7 @@ Copyright (C) 2019 WireGuard LLC. All Rights Reserved. --> -<?if $(var.WIREGUARD_PLATFORM) = "amd64"?> +<?if $(var.WIREGUARD_PLATFORM) = "amd64" Or $(var.WIREGUARD_PLATFORM) = "arm64"?> <?define PlatformProgramFilesFolder = "ProgramFiles64Folder"?> <?else?> <?define PlatformProgramFilesFolder = "ProgramFilesFolder"?> @@ -16,6 +16,8 @@ <?define UpgradeCode = "62754a0a-fee9-4412-b739-e8da2e7c9405"?> <?elseif $(var.WIREGUARD_PLATFORM) = "arm"?> <?define UpgradeCode = "f90bca59-9627-431d-92b4-a5c2d9a529ff"?> +<?elseif $(var.WIREGUARD_PLATFORM) = "arm64"?> + <?define UpgradeCode = "7ff76099-8940-4d3e-99b9-50a3b3ca1ee9"?> <?else?> <?error Unknown platform ?> <?endif?> |