Commit 6048421
build,win: use x64 Node when building for ARM64
Uses x64 node executable for running .js files in arm64
cross-compilation scenarios. MSI can now be created by
running `vcbuild.bat release msi arm64`
Refs: #25998
Refs: #32582
PR-URL: #34009
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>1 parent 3133b75 commit 6048421
3 files changed
Lines changed: 25 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -130,6 +130,9 @@ _UpgradeReport_Files/ | |||
| 130 | 130 | # Ignore dependencies fetched by deps/v8/tools/node/fetch_deps.py | |
| 131 | 131 | /deps/.cipd | |
| 132 | 132 | ||
| 133 | + # === Rules for Windows vcbuild.bat === | ||
| 134 | + /temp-vcbuild | ||
| 135 | + | ||
| 133 | 136 | # === Global Rules === | |
| 134 | 137 | # Keep last to avoid being excluded | |
| 135 | 138 | *.pyc | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -545,6 +545,8 @@ Optional requirements to build the MSI installer package: | |||
| 545 | 545 | * The [WiX Toolset v3.11](https://wixtoolset.org/releases/) and the | |
| 546 | 546 | [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension) | |
| 547 | 547 | or the [Wix Toolset Visual Studio 2019 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension). | |
| 548 | + * The [WiX Toolset v3.14](https://wixtoolset.org/releases/) if | ||
| 549 | + building for Windows 10 on ARM (ARM64). | ||
| 548 | 550 | ||
| 549 | 551 | Optional requirements for compiling for Windows 10 on ARM (ARM64): | |
| 550 | 552 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -397,7 +397,26 @@ if errorlevel 1 echo Failed to sign exe&goto exit | |||
| 397 | 397 | @rem Skip license.rtf generation if not requested. | |
| 398 | 398 | if not defined licensertf goto stage_package | |
| 399 | 399 | ||
| 400 | - %node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf | ||
| 400 | + set "use_x64_node_exe=false" | ||
| 401 | + if "%target_arch%"=="arm64" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set "use_x64_node_exe=true" | ||
| 402 | + if "%use_x64_node_exe%"=="true" ( | ||
| 403 | + echo Cross-compilation to ARM64 detected. We'll use the x64 Node executable for license2rtf. | ||
| 404 | + if not defined "%x64_node_exe%" set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe" | ||
| 405 | + if not exist "%x64_node_exe%" ( | ||
| 406 | + echo Downloading x64 node.exe... | ||
| 407 | + if not exist "temp-vcbuild" mkdir temp-vcbuild | ||
| 408 | + powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile 'temp-vcbuild\node-x64-cross-compiling.exe'" | ||
| 409 | + ) | ||
| 410 | + if not exist "%x64_node_exe%" ( | ||
| 411 | + echo Could not find the Node executable at the given x64_node_exe path. Aborting. | ||
| 412 | + set exit_code=1 | ||
| 413 | + goto exit | ||
| 414 | + ) | ||
| 415 | + %x64_node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf | ||
| 416 | + ) else ( | ||
| 417 | + %node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf | ||
| 418 | + ) | ||
| 419 | + | ||
| 401 | 420 | if errorlevel 1 echo Failed to generate license.rtf&goto exit | |
| 402 | 421 | ||
| 403 | 422 | :stage_package | |
0 commit comments