diff options
| author | Rod Vagg <rod@vagg.org> | 2015-04-20 18:48:51 +1000 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-04-20 19:16:39 +1000 |
| commit | 53ed89d927ff884a03b260201a4435896712562a (patch) | |
| tree | 4634f57fb638df3ea63486b3489161850659a8a8 /vcbuild.bat | |
| parent | 77db7e168e77a964f5767d644f4667841937a793 (diff) | |
| download | android-node-v8-53ed89d927ff884a03b260201a4435896712562a.tar.gz android-node-v8-53ed89d927ff884a03b260201a4435896712562a.tar.bz2 android-node-v8-53ed89d927ff884a03b260201a4435896712562a.zip | |
Revert "build: use %PYTHON% instead of python"
This reverts commit 91943a99d534e67f6b7a7a3be45206afdb3fbf75.
Old commit cherry-picked in but found to cause problems with .msi
creation on Windows.
Original change is mostly pointless because V8 hard-wires
`python` anyway.
PR-URL: https://github.com/iojs/io.js/pull/1475
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 2de38fea96..44d149d322 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -89,12 +89,10 @@ 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 %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG% + python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_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. @@ -176,14 +174,14 @@ if "%config%"=="Release" set test_args=--mode=release %test_args% echo running 'cctest' "%config%\cctest" echo running 'python tools/test.py %test_args%' -"%PYTHON%" tools/test.py %test_args% +python tools/test.py %test_args% goto jslint :jslint if not defined jslint goto exit echo running jslint set PYTHONPATH=tools/closure_linter/;tools/gflags/ -"%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 :create-msvs-files-failed @@ -208,6 +206,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 io.js & exit /b 1 goto :EOF |