build,win: try next MSVS version on failure

joaocgreis · joaocgreis · commit 6ac47aa9f576 · 2015-09-17T10:16:22.000+01:00
This is a port of e07c86e from v0.12. Original commit message: Try the next version of Microsoft Visual Studio when vcvarsall.bat fails to set VCINSTALLDIR. PR-URL: #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> PR-URL: #2910 Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org> Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ if defined msi (`
`97`	`97`	`)`
`98`	`98`	`)`
`99`	`99`	`call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"`
`100`		`-if not defined VCINSTALLDIR goto msbuild-not-found`
	`100`	`+if not defined VCINSTALLDIR goto vc-set-2013`
`101`	`101`	`set GYP_MSVS_VERSION=2015`
`102`	`102`	`set PLATFORM_TOOLSET=v140`
`103`	`103`	`goto msbuild-found`
`@@ -117,7 +117,7 @@ if defined msi (`
`117`	`117`	`)`
`118`	`118`	`)`
`119`	`119`	`call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat"`
`120`		`-if not defined VCINSTALLDIR goto msbuild-not-found`
	`120`	`+if not defined VCINSTALLDIR goto vc-set-2012`
`121`	`121`	`set GYP_MSVS_VERSION=2013`
`122`	`122`	`set PLATFORM_TOOLSET=v120`
`123`	`123`	`goto msbuild-found`
`@@ -136,7 +136,7 @@ if defined msi (`
`136`	`136`	`)`
`137`	`137`	`)`
`138`	`138`	`call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat"`
`139`		`-if not defined VCINSTALLDIR goto msbuild-not-found`
	`139`	`+if not defined VCINSTALLDIR goto vc-set-2010`
`140`	`140`	`set GYP_MSVS_VERSION=2012`
`141`	`141`	`set PLATFORM_TOOLSET=v110`
`142`	`142`	`goto msbuild-found`