Skip to content

Commit

Permalink
build: use %PYTHON% instead of python
Browse files Browse the repository at this point in the history
Like libuv does.

PR-URL: node-forward/node#21
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
rvagg authored and bnoordhuis committed Oct 16, 2014
1 parent cafac11 commit 9116fcd
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ if defined noprojgen goto msbuild

if defined NIGHTLY set TAG=nightly-%NIGHTLY%

if not defined PYTHON set PYTHON=python

@rem Generate the VS project.
SETLOCAL
if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat"
python configure %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
"%PYTHON%" configure %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
if errorlevel 1 goto create-msvs-files-failed
if not exist node.sln goto create-msvs-files-failed
echo Project files generated.
Expand Down Expand Up @@ -191,7 +193,7 @@ goto exit

:run-tests
echo running 'python tools/test.py %test_args%'
python tools/test.py %test_args%
"%PYTHON%" tools/test.py %test_args%
if "%test%"=="test" goto jslint
goto exit

Expand All @@ -213,7 +215,7 @@ goto exit
:jslint
echo running jslint
set PYTHONPATH=tools/closure_linter/
python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
"%PYTHON%" tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
goto exit

:help
Expand All @@ -234,6 +236,6 @@ rem ***************

:getnodeversion
set NODE_VERSION=
for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
for /F "usebackq tokens=*" %%i in (`"%PYTHON%" "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
if not defined NODE_VERSION echo Cannot determine current version of node.js & exit /b 1
goto :EOF

0 comments on commit 9116fcd

Please sign in to comment.