diff options
| author | João Reis <reis@janeasystems.com> | 2015-09-15 16:53:29 +0100 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-09-16 06:30:23 -0400 |
| commit | e07c86e24081bd35512f5fabdfe50e1f1c94b96d (patch) | |
| tree | f800b330d3f3d08971b3c6f458c39f2c813a38eb | |
| parent | 8887666b0bf7f02e7d54509a6155c88be1787731 (diff) | |
| download | node-e07c86e24081bd35512f5fabdfe50e1f1c94b96d.tar.gz | |
build,win: try next MSVS version on failure
Try the next version of Microsoft Visual Studio when vcvarsall.bat
fails to set VCINSTALLDIR.
PR-URL: https://github.com/nodejs/node/pull/2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
| -rw-r--r-- | vcbuild.bat | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index ba08bf14d..6615ff9e7 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -125,7 +125,7 @@ if "%VCVARS_VER%" NEQ "140" ( call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" SET VCVARS_VER=140 ) -if not defined VCINSTALLDIR goto msbuild-not-found +if not defined VCINSTALLDIR goto vc-set-2013 set GYP_MSVS_VERSION=2015 set PLATFORM_TOOLSET=v140 goto msbuild-found @@ -148,7 +148,7 @@ if "%VCVARS_VER%" NEQ "120" ( call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" SET VCVARS_VER=120 ) -if not defined VCINSTALLDIR goto msbuild-not-found +if not defined VCINSTALLDIR goto vc-set-2012 set GYP_MSVS_VERSION=2013 set PLATFORM_TOOLSET=v120 goto msbuild-found @@ -170,7 +170,7 @@ if "%VCVARS_VER%" NEQ "110" ( call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" SET VCVARS_VER=110 ) -if not defined VCINSTALLDIR goto msbuild-not-found +if not defined VCINSTALLDIR goto vc-set-2010 set GYP_MSVS_VERSION=2012 set PLATFORM_TOOLSET=v110 goto msbuild-found |