Skip to content

Commit

Permalink
build,win: try next MSVS version on failure
Browse files Browse the repository at this point in the history
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 <[email protected]>
  Reviewed-By: orangemocha - Alexis Campailla <[email protected]>
  Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>

PR-URL: #2910
Reviewed-By: orangemocha - Alexis Campailla <[email protected]>
Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
  • Loading branch information
joaocgreis committed Sep 17, 2015
1 parent c88a0b2 commit 6ac47aa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 6ac47aa

Please sign in to comment.