diff options
| author | Alexis Campailla <alexis@janeasystems.com> | 2015-07-08 12:31:30 +0200 |
|---|---|---|
| committer | Alexis Campailla <alexis@janeasystems.com> | 2015-07-10 16:32:05 +0200 |
| commit | 84012c99e06ec78888f201ff934b40dc53542582 (patch) | |
| tree | eb2194f24cda71b39cf5bc24147a13c331c875b8 | |
| parent | 59f6b5da2ab8d5db7029641707e9aa0b0f4dae15 (diff) | |
| download | nodejs-84012c99e06ec78888f201ff934b40dc53542582.tar.gz nodejs-84012c99e06ec78888f201ff934b40dc53542582.tar.bz2 nodejs-84012c99e06ec78888f201ff934b40dc53542582.zip | |
build: fix vcbuild merge issues
configure was getting called twice.
We also erroneously introduced support for VS2010,
and were picking 2010 before other versions.
PR-URL: https://github.com/nodejs/io.js/pull/2131
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
| -rw-r--r-- | vcbuild.bat | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 077fb21c5..e452849df 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -87,18 +87,6 @@ if "%i18n_arg%"=="intl-none" set i18n_arg=--with-intl=none call :getnodeversion || exit /b 1 @rem Set environment for msbuild -:project-gen -@rem Skip project generation if requested. -if defined noprojgen goto msbuild - -@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% - if errorlevel 1 goto create-msvs-files-failed - if not exist node.sln goto create-msvs-files-failed - echo Project files generated. -ENDLOCAL @rem Look for Visual Studio 2015 if not defined VS140COMNTOOLS goto vc-set-2013 |