build: add MSVS 2015 support
authorRod Vagg <rod@vagg.org>
Thu, 16 Apr 2015 12:49:49 +0000 (22:49 +1000)
committerRod Vagg <rod@vagg.org>
Thu, 25 Jun 2015 03:00:27 +0000 (13:00 +1000)
PR-URL: https://github.com/nodejs/io.js/pull/2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
vcbuild.bat

index 711cd3a..1009efd 100644 (file)
@@ -88,6 +88,18 @@ if defined NIGHTLY set TAG=nightly-%NIGHTLY%
 
 @rem Set environment for msbuild
 
+@rem Look for Visual Studio 2015
+if not defined VS140COMNTOOLS goto vc-set-2013
+if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
+if "%VCVARS_VER%" NEQ "140" (
+  call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
+  SET VCVARS_VER=140
+)
+if not defined VCINSTALLDIR goto vc-set-2013
+set GYP_MSVS_VERSION=2015
+goto msbuild-found
+
+:vc-set-2013
 @rem Look for Visual Studio 2013
 if not defined VS120COMNTOOLS goto msbuild-not-found
 if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found