Skip to content

win,msi: use x64 node executable when cross-compiling for arm64 #34009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dennisameling wants to merge 5 commits into from
Closed

win,msi: use x64 node executable when cross-compiling for arm64 #34009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d60e8a9
win,msi: download x64 node executable when cross-compiling for arm64
dennisameling Jun 22, 2020
aeaa450
doc: update windows arm64 build instructions
dennisameling Jun 22, 2020
baba312
doc: fix linting in BUILDING.md
dennisameling Jun 22, 2020
21f392b
win,msi: use x64 node for license2rtf (ARM64)
dennisameling Aug 8, 2020
d9b0d27
Apply suggestions from code review
dennisameling Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
win,msi: download x64 node executable when cross-compiling 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
  • Loading branch information
@dennisameling
dennisameling committed Aug 8, 2020
commit d60e8a9702a601d6e14886fb64ca33766c16e749
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ _UpgradeReport_Files/
# Ignore dependencies fetched by deps/v8/tools/node/fetch_deps.py
/deps/.cipd

# === Rules for Windows vcbuild.bat ===
/temp-vcbuild

# === Global Rules ===
# Keep last to avoid being excluded
*.pyc
Expand Down
14 changes: 14 additions & 0 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,20 @@ if defined package set stage_package=1

:: assign path to node_exe
set "node_exe=%config%\node.exe"
if "%target_arch%"=="arm64" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
if not defined "%x64_node_exe%" set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe"
if not exist "%x64_node_exe%" (
echo Downloading x64 node.exe...
if not exist "temp-vcbuild" mkdir temp-vcbuild
powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile 'temp-vcbuild\node-x64-cross-compiling.exe'"
)
if not exist "%x64_node_exe%" (
echo Could not find the Node executable at the given x64_node_exe path. Aborting.
goto exit
Comment thread
dennisameling marked this conversation as resolved.
Outdated
)
echo Using x64 Node executable because we're cross-compiling for arm64: %x64_node_exe%
set "node_exe=%x64_node_exe%"
Comment thread
dennisameling marked this conversation as resolved.
Outdated
)
set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp"
set "npm_exe="%~dp0%node_exe%" %~dp0deps\npm\bin\npm-cli.js"
if "%target_env%"=="vs2019" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2019"
Expand Down