bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-31 16:53:27 +00:00
Code Issues Releases Wiki Activity

Support x64 for cross-platform Appx builds

Browse Source
This commit is contained in:
Isaiah Inuwa
2025-12-04 08:46:23 -06:00
parent 4eb6c40ca7
commit 9d10da366f
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/desktop/cross-build.ps1
View File

@@ -1,9 +1,11 @@
#!/usr/bin/env pwsh
param(
[Parameter(Mandatory=$true)]
[System.Runtime.InteropServices.Architecture]$Architecture,
$CertificatePath,
$CertificatePassword,
$ElectronConfigFile="electron-builder.json",
$Target="debug"
[Switch]$Release=$false
)
$ErrorActionPreference = "Stop"
$PSNativeCommandUseErrorActionPreference = $true
@@ -22,10 +24,10 @@ $assetsDir = Get-Item $builderConfig.directories.buildResources
$buildDir = Get-Item $builderConfig.directories.app
$outDir = Join-Path (Get-Location) ($builderConfig.directories.output ?? "dist")
if ($target -eq "release") {
$targetStr = "--release"
if ($Release) {
$buildConfiguration = "--release"
}
$arch = 'arm64'
$arch = "$Architecture".ToLower()
$ext = "appx"
$version = Get-Date -Format "yyyy.M.d.Hmm"
# $buildNumber = Get-Date -Format "HHmm"
@@ -34,7 +36,15 @@ $productName = $builderConfig.productName
$artifactName = "${productName}-$($packageConfig.version)-${arch}.$ext"
Write-Host "Building native code"
npm run build-native-win-cross -- $targetStr
$rustTarget = switch ($Architecture) {
X64 { "x86_64-pc-windows-msvc" }
ARM64 { "aarch64-pc-windows-msvc" }
default {
Write-Error "Unsupported architecture: $Architecture. Supported architectures are x64 and arm64"
Exit(1)
}
}
npm run build-native-win-cross -- $buildConfiguration "--target=$rustTarget"
Write-Host "Building Javascript code"
if ($target -eq "release") {
@@ -55,7 +65,12 @@ New-Item -Type Directory (Join-Path $outDir "appx")
Write-Host "Building Appx directory structure"
$appxDir = (Join-Path $outDir appx/app)
Move-Item (Join-Path $outDir "win-${arch}-unpacked") $appxDir
if ($arch -eq "x64") {
Move-Item (Join-Path $outDir "win-unpacked") $appxDir
}
else {
Move-Item (Join-Path $outDir "win-${arch}-unpacked") $appxDir
}
Write-Host "Copying Assets"
New-Item -Type Directory (Join-Path $outDir appx/assets)
@@ -103,7 +118,7 @@ else {
$endTime = Get-Date
$elapsed = $endTime - $startTime
Write-Host "Successfully packaged $(Get-Item $outfile)"
Write-Host ("Finished in $($elapsed.ToString('mm')) minutes and $($elapsed.ToString('ss')).$($elapsed.ToString('fff')) seconds")
Write-Host ("Finished at $($endTime.ToString('HH:mm:ss')) in $($elapsed.ToString('mm')) minutes and $($elapsed.ToString('ss')).$($elapsed.ToString('fff')) seconds")
}
finally {
Set-Location -Path $originalLocation

2
apps/desktop/package.json
View File

@@ -20,7 +20,7 @@
"start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build",
"build-native-macos": "cd desktop_native && ./macos_provider/build.sh && node build.js cross-platform",
"build-native": "cd desktop_native && node build.js",
"build-native-win-cross": "cd desktop_native && node build.js cross-platform --target=aarch64-pc-windows-msvc",
"build-native-win-cross": "cd desktop_native && node build.js cross-platform",
"build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"",
"build:dev": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\" \"npm run build:preload:dev\"",
"build:preload": "cross-env NODE_ENV=production webpack --config webpack.config.js --config-name preload",