Skip to content
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

Jump to bottom

win,build: improvements to vcbuild.bat #8412

Closed
wants to merge 3 commits into from
Closed

win,build: improvements to vcbuild.bat #8412

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7642724
win,build: fail on invalid option in vcbuild
joaocgreis Sep 1, 2016
f26497c
win,build: skip finding VS when not needed
joaocgreis Sep 4, 2016
f2f2aa4
win,build: exit when addons fail to build
joaocgreis Sep 5, 2016
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
9 changes: 8 additions & 1 deletion vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ if /i "%1"=="ignore-flaky" set test_args=%test_args% --flaky-tests=dontcare&got
if /i "%1"=="enable-vtune" set enable_vtune_arg=1&goto arg-ok
if /i "%1"=="dll" set dll=1&goto arg-ok

echo Warning: ignoring invalid command line option `%1`.
echo Error: invalid command line option `%1`.
exit /b 1

:arg-ok
:arg-ok
Expand Down Expand Up @@ -128,6 +129,8 @@ call :getnodeversion || exit /b 1

if "%target%"=="Clean" rmdir /Q /S "%~dp0%config%\node-v%FULLVERSION%-win-%target_arch%" > nul 2> nul

if defined noprojgen if defined nobuild if defined nosign if not defined msi goto licensertf

@rem Set environment for msbuild

if defined target_env if "%target_env%" NEQ "vc2015" goto vc-set-2013
Expand Down Expand Up @@ -340,12 +343,16 @@ for /d %%F in (test\addons\??_*) do (
)
:: generate
"%node_exe%" tools\doc\addon-verify.js
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 ^
--directory="%%F" ^
--nodedir="%cd%"
if !errorlevel! neq 0 exit /b !errorlevel!
)
EndLocal
goto run-tests

:run-tests
Expand Down