Fixed creation of ARM64 installer, added back building Windows modules in build.sh, updated submodules

Author: dpaoliello

.gitignore

@@ -20,6 +20,7 @@
 /dist-assets/openvpn.exe
 /dist-assets/aarch64-apple-darwin/
 /dist-assets/x86_64-apple-darwin/
+/dist-assets/aarch64-pc-windows-msvc/
 /windows/version.h
 /windows/**/bin/
 /windows/**/*.user

CHANGELOG.md

@@ -26,6 +26,9 @@ Line wrap the file at 100 chars.                                              Th
 - Add DAITA (Defence against AI-guided Traffic Analysis) setting for Linux and macOS.
 - Add `--json` flag to `mullvad status` CLI.
 
+#### Windows
+- Add experimental support for Windows ARM64.
+
 ### Changed
 - Ignore obfuscation protocol constraints when the obfuscation mode is set to auto.
 
@@ -53,9 +56,6 @@ This release is identical to 2024.4-beta1.
 #### macOS
 - Add support for split tunneling (beta).
 
-#### Windows
-- Add experimental support for Windows ARM64.
-
 ### Changed
 - Update Electron from 28.1.3 to 30.0.4.
 

Cargo.lock

@@ -287,6 +287,32 @@ function build {
     done
 }
 
+if [[ "$(uname -s)" == "MINGW"* ]]; then
+    for t in "${TARGETS[@]:-"x86_64-pc-windows-msvc"}"; do
+        case $t in
+            x86_64-pc-windows-msvc) CPP_BUILD_TARGET=x64;;
+            aarch64-pc-windows-msvc) CPP_BUILD_TARGET=ARM64;;
+            *)
+                log_error "Unknown Windows target: $t"
+                exit 1
+                ;;
+        esac
+
+        log_header "Building C++ code in $CPP_BUILD_MODE mode for $CPP_BUILD_TARGET"
+        CPP_BUILD_MODES=$CPP_BUILD_MODE CPP_BUILD_TARGETS=$CPP_BUILD_TARGET IS_RELEASE=$IS_RELEASE ./build-windows-modules.sh
+
+        if [[ "$SIGN" == "true" ]]; then
+            CPP_BINARIES=(
+                "windows/winfw/bin/$CPP_BUILD_TARGET-$CPP_BUILD_MODE/winfw.dll"
+                "windows/driverlogic/bin/$CPP_BUILD_TARGET-$CPP_BUILD_MODE/driverlogic.exe"
+                # The nsis plugin is always built in 32 bit release mode
+                windows/nsis-plugins/bin/Win32-Release/*.dll
+            )
+            sign_win "${CPP_BINARIES[@]}"
+        fi
+    done
+fi
+
 for t in "${TARGETS[@]:-""}"; do
     source env.sh "$t"
     build "$t"

build.sh

@@ -86,7 +86,7 @@
 !macro ExtractDriverlogic
 
 	SetOutPath "$PLUGINSDIR"
-	File "${BUILD_RESOURCES_DIR}\..\windows\driverlogic\bin\x64-$%CPP_BUILD_MODE%\driverlogic.exe"
+	File "${BUILD_RESOURCES_DIR}\..\windows\driverlogic\bin\$%CPP_BUILD_TARGET%-$%CPP_BUILD_MODE%\driverlogic.exe"
 
 !macroend
 
@@ -100,8 +100,9 @@
 !macro ExtractWireGuard
 
 	SetOutPath "$PLUGINSDIR"
+	# No AArch64 wintun, so use x64.
 	File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wintun\wintun.dll"
-	File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wireguard-nt\mullvad-wireguard.dll"
+	File "${BUILD_RESOURCES_DIR}\binaries\$%TARGET_TRIPLE%\wireguard-nt\mullvad-wireguard.dll"
 
 !macroend
 
@@ -115,8 +116,8 @@
 !macro ExtractMullvadSetup
 
 	SetOutPath "$PLUGINSDIR"
-	File "${BUILD_RESOURCES_DIR}\mullvad-setup.exe"
-	File "${BUILD_RESOURCES_DIR}\..\windows\winfw\bin\x64-$%CPP_BUILD_MODE%\winfw.dll"
+	File "${BUILD_RESOURCES_DIR}\$%SETUP_SUBDIR%\mullvad-setup.exe"
+	File "${BUILD_RESOURCES_DIR}\..\windows\winfw\bin\$%CPP_BUILD_TARGET%-$%CPP_BUILD_MODE%\winfw.dll"
 
 !macroend
 

dist-assets/binaries

@@ -138,17 +138,18 @@ const config = {
     artifactName: 'MullvadVPN-${version}_${arch}.${ext}',
     publisherName: 'Mullvad VPN AB',
     extraResources: [
-      { from: distAssets('mullvad.exe'), to: '.' },
-      { from: distAssets('mullvad-problem-report.exe'), to: '.' },
-      { from: distAssets('mullvad-daemon.exe'), to: '.' },
-      { from: distAssets('talpid_openvpn_plugin.dll'), to: '.' },
+      { from: distAssets(path.join(getWindowsDistSubdir(), 'mullvad.exe')), to: '.' },
+      { from: distAssets(path.join(getWindowsDistSubdir(), 'mullvad-problem-report.exe')), to: '.' },
+      { from: distAssets(path.join(getWindowsDistSubdir(), 'mullvad-daemon.exe')), to: '.' },
+      { from: distAssets(path.join(getWindowsDistSubdir(), 'talpid_openvpn_plugin.dll')), to: '.' },
       {
-        from: root(path.join('windows', 'winfw', 'bin', '${env.CPP_BUILD_TARGET}-${env.CPP_BUILD_MODE}', 'winfw.dll')),
+        from: root(path.join('windows', 'winfw', 'bin', getWindowsTargetArch() + '-${env.CPP_BUILD_MODE}', 'winfw.dll')),
         to: '.',
       },
-      { from: distAssets(path.join('binaries', getWindowsTargetSubdir(), 'openvpn.exe')), to: '.' },
-      { from: distAssets(path.join('binaries', getWindowsTargetSubdir(), 'apisocks5.exe')), to: '.' },
-      { from: distAssets(path.join('binaries', getWindowsTargetSubdir(), 'wintun/wintun.dll')), to: '.' },
+      // OpenVPN, APISocks5 and Wintun do not have ARM64 builds yet.
+      { from: distAssets(path.join('binaries/x86_64-pc-windows-msvc/openvpn.exe')), to: '.' },
+      { from: distAssets(path.join('binaries/x86_64-pc-windows-msvc/apisocks5.exe')), to: '.' },
+      { from: distAssets(path.join('binaries/x86_64-pc-windows-msvc/wintun/wintun.dll')), to: '.' },
       {
         from: distAssets(path.join('binaries', getWindowsTargetSubdir(), 'split-tunnel/mullvad-split-tunnel.sys')),
         to: '.'
@@ -254,6 +255,18 @@ function packWin() {
       beforeBuild: (options) => {
         process.env.CPP_BUILD_MODE = release ? 'Release' : 'Debug';
         process.env.CPP_BUILD_TARGET = options.arch;
+        switch (options.arch) {
+          case 'x64':
+            process.env.TARGET_TRIPLE = 'x86_64-pc-windows-msvc';
+            process.env.SETUP_SUBDIR = '.';
+            break;
+          case 'arm64':
+            process.env.TARGET_TRIPLE = 'aarch64-pc-windows-msvc';
+            process.env.SETUP_SUBDIR = 'aarch64-pc-windows-msvc';
+            break;
+          default:
+            throw new Error(`Invalid or unknown target (only one may be specified)`);
+        }
         return true;
       },
       afterAllArtifactBuild: (buildResult) => {
@@ -396,14 +409,22 @@ function root(relativePath) {
   return path.join(path.resolve(__dirname, '../../'), relativePath);
 }
 
+function getWindowsDistSubdir() {
+  if (targets === 'aarch64-pc-windows-msvc') {
+    return targets;
+  } else {
+    return '';
+  }
+}
+
 function getWindowsTargetArch() {
   if (targets && process.platform === 'win32') {
     if (targets === 'aarch64-pc-windows-msvc') {
       return 'arm64';
     }
     throw new Error(`Invalid or unknown target (only one may be specified)`);
   }
-  // Use host architecture.
+  // Use host architecture (we assume this is x64 since building on Arm64 isn't supported).
   return 'x64';
 }
 
@@ -414,7 +435,7 @@ function getWindowsTargetSubdir() {
     }
     throw new Error(`Invalid or unknown target (only one may be specified)`);
   }
-  // Use host architecture.
+  // Use host architecture (we assume this is x64 since building on Arm64 isn't supported).
   return 'x86_64-pc-windows-msvc';
 }
 

dist-assets/windows/installer.nsh

@@ -8,9 +8,12 @@ mod win {
         manifest_dir().join(build_dir).join(target_platform_dir())
     }
 
-    fn target_platform_dir() -> PathBuf {
-        let target = env::var("TARGET").expect("TARGET env var not set");
+    pub fn target() -> String {
+        env::var("TARGET").expect("TARGET env var not set")
+    }
 
+    fn target_platform_dir() -> PathBuf {
+        let target = target();
         let target_dir = match target.as_str() {
             "i686-pc-windows-msvc" => format!("Win32-{}", get_build_mode()),
             "x86_64-pc-windows-msvc" => format!("x64-{}", get_build_mode()),
@@ -53,7 +56,7 @@ fn main() {
 
     const WINFW_DIR_VAR: &str = "WINFW_LIB_DIR";
     declare_library(WINFW_DIR_VAR, WINFW_BUILD_DIR, "winfw");
-    let lib_dir = manifest_dir().join("../build/lib/x86_64-pc-windows-msvc");
+    let lib_dir = manifest_dir().join("../build/lib").join(target());
     println!("cargo::rustc-link-search={}", &lib_dir.display());
 }