Skip to content

build, windows: build and test add-ons on test-ci #5886

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
blobor wants to merge 6 commits into from
Closed

build, windows: build and test add-ons on test-ci #5886

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff3d2a7
build, windows: build and test add-ons on test-ci
Mar 24, 2016
32caebb
build, windows: check if "node_exe" defined
Mar 24, 2016
26f3f04
build, windows: move "node_exe" variable assignment.
Mar 24, 2016
ee5e294
build, windows: changes accordingly to PR comment
Mar 24, 2016
683fb9a
Merge remote-tracking branch 'upstream/master'
Mar 27, 2016
c1b7db7
build, windows: changes accordingly to PR comments
Mar 28, 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
Prev Previous commit
build, windows: changes accordingly to PR comments 
move "node_exe" variable assignment
change backslashes
  • Loading branch information
Bogdan Lobor committed Mar 28, 2016
commit c1b7db7cd00c3ae6c4d7499115d866df9336dc8a
16 changes: 8 additions & 8 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ set enable_vtune_arg=
set configure_flags=
set build_addons=

:: assign path to node_exe
set node_exe="%config%\node.exe"

:next-arg
if "%1"=="" goto args-done
if /i "%1"=="debug" set config=Debug&goto arg-ok
Expand Down Expand Up @@ -96,6 +93,9 @@ if defined build_release (
set i18n_arg=small-icu
)

:: assign path to node_exe
set node_exe=%config%\node.exe

if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
Expand Down Expand Up @@ -266,12 +266,12 @@ for /d %%F in (test\addons\??_*) do (
rd /s /q %%F
)
:: generate
%node_exe% tools/doc/addon-verify.js
"%node_exe%" "tools\doc\addon-verify.js"
:: building addons
for /d %%F in (test/addons/*) do (
%node_exe% deps/npm/node_modules/node-gyp/bin/node-gyp rebuild ^
--directory=test/addons/%%F ^
--nodedir=%cd%
for /d %%F in (test\addons\*) do (
"%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild ^
--directory="%%F" ^
--nodedir="%cd%"
)
goto run-tests

Expand Down