From 19c896dd086abb351361eab54b7e88ed5ce8af08 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Mon, 3 Apr 2017 07:57:21 -0400 Subject: [PATCH] win,build: support building with VS2017 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Detection is attempted with `vswhere`. PR-URL: https://github.com/libuv/libuv/pull/1284 Reviewed-By: Bartosz Sosnowski Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Saúl Ibarra Corretgé --- tools/vswhere_usability_wrapper.cmd | 33 +++++++++++++++++++++++++++++ vcbuild.bat | 28 ++++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 tools/vswhere_usability_wrapper.cmd diff --git a/tools/vswhere_usability_wrapper.cmd b/tools/vswhere_usability_wrapper.cmd new file mode 100644 index 00000000..e4acf03e --- /dev/null +++ b/tools/vswhere_usability_wrapper.cmd @@ -0,0 +1,33 @@ +:: Copyright 2017 - Refael Ackermann +:: Distributed under MIT style license or the libuv license +:: See accompanying file LICENSE at https://github.com/node4good/windows-autoconf +:: or libuv LICENSE file at https://github.com/libuv/libuv +:: version: 1.15.3 + +@if not defined DEBUG_HELPER @ECHO OFF +setlocal +set "InstallerPath=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer" +if not exist "%InstallerPath%" set "InstallerPath=%ProgramFiles%\Microsoft Visual Studio\Installer" +if not exist "%InstallerPath%" exit goto :no-vswhere +:: Manipulate %Path% for easier " handeling +set Path=%Path%;%InstallerPath% +where vswhere 2> nul > nul +if errorlevel 1 goto :no-vswhere +set VSWHERE_REQ=-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 +set VSWHERE_PRP=-property installationPath +set VSWHERE_LMT=-version "[15.0,16.0)" +vswhere -prerelease > nul +if "%~1"=="prerelase" set VSWHERE_WITH_PRERELASE=1 +if not errorlevel 1 if "%VSWHERE_WITH_PRERELASE%"=="1" set "VSWHERE_LMT=%VSWHERE_LMT% -prerelease" +SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% +for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do ( + endlocal + set "VCINSTALLDIR=%%i\VC\" + set "VS150COMNTOOLS=%%i\Common7\Tools\" + exit /B 0 +) + +:no-vswhere +endlocal +echo could not find "vswhere" +exit /B 1 \ No newline at end of file diff --git a/vcbuild.bat b/vcbuild.bat index 91f45b72..a86e2369 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -14,10 +14,11 @@ if /i "%1"=="/?" goto help @rem Process arguments. set config= set target=Build +set target_arch=ia32 +set target_env= set noprojgen= set nobuild= set run= -set target_arch=ia32 set vs_toolset=x86 set msbuild_platform=WIN32 set library=static_library @@ -29,6 +30,7 @@ if /i "%1"=="release" set config=Release&goto arg-ok if /i "%1"=="test" set run=run-tests.exe&goto arg-ok if /i "%1"=="bench" set run=run-benchmarks.exe&goto arg-ok if /i "%1"=="clean" set target=Clean&goto arg-ok +if /i "%1"=="vs2017" set target_env=vs2017&goto arg-ok if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok if /i "%1"=="nobuild" set nobuild=1&goto arg-ok if /i "%1"=="x86" set target_arch=ia32&set msbuild_platform=WIN32&set vs_toolset=x86&goto arg-ok @@ -41,10 +43,28 @@ shift goto next-arg :args-done -if defined WindowsSDKDir goto select-target -if defined VCINSTALLDIR goto select-target +@rem Look for Visual Studio 2017 only if explicitly requested. +if "%target_env%" NEQ "vs2017" goto vs-set-2015 +echo Looking for Visual Studio 2017 +@rem Check if VS2017 is already setup, and for the requested arch. +if "_%VisualStudioVersion%_" == "_15.0_" if "_%VSCMD_ARG_TGT_ARCH%_"=="_%vs_toolset%_" goto found_vs2017 +set "VSINSTALLDIR=" +call tools\vswhere_usability_wrapper.cmd +if "_%VCINSTALLDIR%_" == "__" goto vs-set-2015 +@rem Need to clear VSINSTALLDIR for vcvarsall to work as expected. +set vcvars_call="%VCINSTALLDIR%\Auxiliary\Build\vcvarsall.bat" %vs_toolset% +echo calling: %vcvars_call% +call %vcvars_call% + +:found_vs2017 +echo Found MSVS version %VisualStudioVersion% +if %VSCMD_ARG_TGT_ARCH%==x64 set target_arch=x64&set msbuild_platform=x64&set vs_toolset=x64 +set GYP_MSVS_VERSION=2017 +goto select-target + @rem Look for Visual Studio 2015 +:vs-set-2015 if not defined VS140COMNTOOLS goto vc-set-2013 if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013 call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset% @@ -148,7 +168,7 @@ echo Failed to create vc project files. exit /b 1 :help -echo vcbuild.bat [debug/release] [test/bench] [clean] [noprojgen] [nobuild] [x86/x64] [static/shared] +echo vcbuild.bat [debug/release] [test/bench] [clean] [noprojgen] [nobuild] [vs2017] [x86/x64] [static/shared] echo Examples: echo vcbuild.bat : builds debug build echo vcbuild.bat test : builds debug build and runs tests