diff options
| author | Tanner Gooding <tagoo@outlook.com> | 2017-03-03 21:32:28 -0800 |
|---|---|---|
| committer | Tanner Gooding <tagoo@outlook.com> | 2017-03-06 08:30:44 -0800 |
| commit | 029c38fa726ccfc5bf3e18a567075643ee5efd35 (patch) | |
| tree | 25e0f894c426708f59cdb7aa0150d86efd4df9c6 /build-test.cmd | |
| parent | ccf4cb343f6b9f47fc4b08d8811ead1caa3c706c (diff) | |
| download | coreclr-029c38fa726ccfc5bf3e18a567075643ee5efd35.tar.gz coreclr-029c38fa726ccfc5bf3e18a567075643ee5efd35.tar.bz2 coreclr-029c38fa726ccfc5bf3e18a567075643ee5efd35.zip | |
Updating the build scripts to support VS2017.
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/build-test.cmd b/build-test.cmd index b766c17691..f0d1def82c 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -6,8 +6,17 @@ set __BuildArch=x64 set __VCBuildArch=x86_amd64 set __BuildType=Debug set __BuildOS=Windows_NT -set __VSVersion=vs2015 -set __VSToolsRoot=%VS140COMNTOOLS% + +:: Default to highest Visual Studio version available +if defined VS150COMNTOOLS ( + set "__VSToolsRoot=%VS150COMNTOOLS%" + set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build" + set __VSVersion=vs2017 +) else ( + set "__VSToolsRoot=%VS140COMNTOOLS%" + set "__VCToolsRoot=%VS140COMNTOOLS%\..\..\VC" + set __VSVersion=vs2015 +) :: Define a prefix for most output progress messages that come from this script. That makes :: it easier to see where these are coming from. Note that there is a trailing space here. @@ -137,8 +146,8 @@ if defined __ToolsetDir ( ) :: Set the environment for the native build -echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch% -call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch% +echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" %__VCBuildArch% +call "%__VCToolsRoot%\vcvarsall.bat" %__VCBuildArch% @if defined _echo @echo on if not defined VSINSTALLDIR ( @@ -397,8 +406,8 @@ This is due to a bug in the Visual Studio installer. It does not install DIA SDK at the install location of previous Visual Studio version. The workaround is to copy the DIA SDK folder from the Visual Studio install location ^ of the previous version to "%VSINSTALLDIR%" and then build. :: DIA SDK not included in Express editions -echo Visual Studio 2013 Express does not include the DIA SDK. ^ -You need Visual Studio 2013+ (Community is free). +echo Visual Studio Express does not include the DIA SDK. ^ +You need Visual Studio 2015 or 2017 (Community is free). echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites exit /b 1 |