From 6ac47aa9f57605344d5964977b5f3e93bf4e827e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 15 Sep 2015 16:53:29 +0100 Subject: [PATCH] build,win: try next MSVS version on failure This is a port of e07c86e24081bd35512f5fabdfe50e1f1c94b96d from v0.12. Original commit message: 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 Reviewed-By: orangemocha - Alexis Campailla Reviewed-By: bnoordhuis - Ben Noordhuis PR-URL: https://github.com/nodejs/node/pull/2910 Reviewed-By: orangemocha - Alexis Campailla Reviewed-By: bnoordhuis - Ben Noordhuis --- vcbuild.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index c0d189cf37ddfe..9d462c9e74b793 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -97,7 +97,7 @@ if defined msi ( ) ) call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" -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 @@ -117,7 +117,7 @@ if defined msi ( ) ) call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" -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 @@ -136,7 +136,7 @@ if defined msi ( ) ) call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" -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