diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-10-23 18:25:17 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-13 14:40:36 +0100 |
| commit | c037da71587f6043dae49086caa7720b4dcc48f7 (patch) | |
| tree | fb02f57feda8c39abd9eb3627af948420200e5ee /installer | |
| parent | firewall, winipcfg: add arm and arm64 build tags (diff) | |
| download | wireguard-windows-c037da71587f6043dae49086caa7720b4dcc48f7.tar.xz wireguard-windows-c037da71587f6043dae49086caa7720b4dcc48f7.zip | |
wintun: move to RCDATA resource
Signed-off-by: Simon Rozman <simon@rozman.si>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/build.bat | 2 | ||||
| -rw-r--r-- | installer/wireguard.wxs | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/installer/build.bat b/installer/build.bat index 864987d8..318fbb29 100644 --- a/installer/build.bat +++ b/installer/build.bat @@ -22,8 +22,6 @@ if exist .deps\prepared goto :build rmdir /s /q .deps 2> NUL mkdir .deps || goto :error cd .deps || goto :error - call :download wintun-x86.msm https://www.wintun.net/builds/wintun-x86-0.8.1.msm 5b47f83ffa9c361a360196d692f64755183e82c65f4753accc92087e6736af10 || goto :error - call :download wintun-amd64.msm https://www.wintun.net/builds/wintun-amd64-0.8.1.msm af9644438a716f5a022052e3574ee0404c3e3309daff84889d656178fbc6b168 || goto :error call :download wix-binaries.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip 2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e || goto :error echo [+] Extracting wix-binaries.zip mkdir wix\bin || goto :error diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs index 5bbb1ebb..ae08ac4a 100644 --- a/installer/wireguard.wxs +++ b/installer/wireguard.wxs @@ -42,7 +42,6 @@ <Property Id="ARPURLINFOABOUT" Value="https://www.wireguard.com/" /> <Property Id="ARPNOMODIFY" Value="yes" /> <Property Id="DISABLEADVTSHORTCUTS" Value="yes" /> - <Property Id="DISABLEROLLBACK" Value="yes" /> <Property Id="MSIDISABLERMRESTART" Value="1" /> <Property Id="MSIRMSHUTDOWN" Value="1" /> @@ -90,21 +89,11 @@ </ComponentGroup> <!-- - Merge modules - --> - <DirectoryRef Id="WireGuardFolder"> - <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-$(var.WIREGUARD_PLATFORM).msm" /> - </DirectoryRef> - - <!-- Features --> <Feature Id="WireGuardFeature" Title="WireGuard" Level="1"> <ComponentGroupRef Id="WireGuardComponents" /> </Feature> - <Feature Id="WintunFeature" Title="Wintun" Level="1"> - <MergeRef Id="WintunMergeModule" /> - </Feature> <!-- Evaluate WireGuard services and populate ServiceControl table |