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
Next Next commit
build, windows: move "node_exe" variable assignment. 
this should fix issue with running test-ci on non-build servers.
  • Loading branch information
Bogdan Lobor committed Mar 24, 2016
commit 26f3f04209a20c029ba80e511c87ebdec4a3da10
6 changes: 3 additions & 3 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ set enable_vtune_arg=
set configure_flags=
set build_addons=

:: assign path to node_exe
set node_exe="%config%\node.exe"
Copy link
Copy Markdown
Member

@joaocgreis joaocgreis Mar 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct place for this is after all set config= have happened, before the configure_flags are prepared, exactly at

node/vcbuild.bat

Line 93 in 089c6a4

. @blobor can you move this?

Copy link
Copy Markdown
Member

@joaocgreis joaocgreis Mar 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The quotes should not be stored in the variable, but added to every place where the variable is used, to be consistent with all other variables in this file.


:next-arg
if "%1"=="" goto args-done
if /i "%1"=="debug" set config=Debug&goto arg-ok
Expand Down Expand Up @@ -195,9 +198,6 @@ msbuild node.sln /m /t:%target% /p:Configuration=%config% /p:Platform=%msbplatfo
if errorlevel 1 goto exit
if "%target%" == "Clean" goto exit

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

:sign
@rem Skip signing if the `nosign` option was specified.
if defined nosign goto licensertf
Expand Down