diff options
| author | João Reis <reis@janeasystems.com> | 2017-06-22 04:34:28 +0100 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2017-06-30 19:21:32 +0100 |
| commit | c9cf7c2780e4f5ae8ad6583c8b179b59d676c1f1 (patch) | |
| tree | f6254372b6ffed768fe53ab6a95caf68b0003220 /vcbuild.bat | |
| parent | e783475412a315d28dde17d23492c867bf546dc2 (diff) | |
| download | android-node-v8-c9cf7c2780e4f5ae8ad6583c8b179b59d676c1f1.tar.gz android-node-v8-c9cf7c2780e4f5ae8ad6583c8b179b59d676c1f1.tar.bz2 android-node-v8-c9cf7c2780e4f5ae8ad6583c8b179b59d676c1f1.zip | |
build,win: respect VS version for building addons
When building in machines with multiple versions of Visual Studio
installed, node-gyp should respect the vs2015/vs2017 arguments passed
to vcbuild.bat instead of relying on its own detection mechanism.
PR-URL: https://github.com/nodejs/node/pull/13911
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index feac258b6e..51aad8db8f 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -122,6 +122,9 @@ if defined build_release ( :: assign path to node_exe set "node_exe=%config%\node.exe" +set "node_gyp_exe="%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp" +if "%target_env%"=="vs2015" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2015" +if "%target_env%"=="vs2017" set "node_gyp_exe=%node_gyp_exe% --msvs_version=2017" if "%config%"=="Debug" set configure_flags=%configure_flags% --debug if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot @@ -351,7 +354,7 @@ ssh -F %SSHCONFIG% %STAGINGSERVER% "touch nodejs/%DISTTYPEDIR%/v%FULLVERSION%/no @rem Build test/gc add-on if required. if "%build_testgc_addon%"=="" goto build-addons -"%config%\node" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild --directory="%~dp0test\gc" --nodedir="%~dp0." +%node_gyp_exe% rebuild --directory="%~dp0test\gc" --nodedir="%~dp0." if errorlevel 1 goto build-testgc-addon-failed goto build-addons @@ -376,7 +379,7 @@ if %errorlevel% neq 0 exit /b %errorlevel% :: building addons setlocal EnableDelayedExpansion for /d %%F in (test\addons\*) do ( - "%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild ^ + %node_gyp_exe% rebuild ^ --directory="%%F" ^ --nodedir="%cd%" if !errorlevel! neq 0 exit /b !errorlevel! @@ -395,7 +398,7 @@ for /d %%F in (test\addons-napi\??_*) do ( ) :: building addons-napi for /d %%F in (test\addons-napi\*) do ( - "%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild ^ + %node_gyp_exe% rebuild ^ --directory="%%F" ^ --nodedir="%cd%" ) |