From 321de5682c7e3ee435cb74e92d17492412a56ca4 Mon Sep 17 00:00:00 2001 From: Haydn Trigg Date: Wed, 21 Mar 2018 22:57:42 +1030 Subject: [PATCH 1/3] Generic Visual Studio 2017 build script --- build/VS_scripts/build.VS2017.cmd | 7 +++++++ build/VS_scripts/build.generic.cmd | 12 ++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 build/VS_scripts/build.VS2017.cmd diff --git a/build/VS_scripts/build.VS2017.cmd b/build/VS_scripts/build.VS2017.cmd new file mode 100644 index 00000000..a810faa5 --- /dev/null +++ b/build/VS_scripts/build.VS2017.cmd @@ -0,0 +1,7 @@ +@echo off + +rem build 32-bit +call "%~p0%build.generic.cmd" VS2017 Win32 Release v141 + +rem build 64-bit +call "%~p0%build.generic.cmd" VS2017 x64 Release v141 \ No newline at end of file diff --git a/build/VS_scripts/build.generic.cmd b/build/VS_scripts/build.generic.cmd index aa24053d..a9bb179f 100644 --- a/build/VS_scripts/build.generic.cmd +++ b/build/VS_scripts/build.generic.cmd @@ -29,11 +29,23 @@ EXIT /B 1 :build SET msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" +SET msbuild_vs2017community="%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" +SET msbuild_vs2017professional="%programfiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" +SET msbuild_vs2017enterprise="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2013 SET msbuild="%programfiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2015 SET msbuild="%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2017Community SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2017Professional SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2017Enterprise SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" +if exist %msbuild_vs2017enterprise% ( + IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017enterprise% +) +if exist %msbuild_vs2017professional% ( + IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017professional% +) +if exist %msbuild_vs2017community% ( + IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017community% +) SET project="%~p0\..\VS2010\zstd.sln" From 57e6b98eb11af763dc2d24bd066a0375f0dab8d9 Mon Sep 17 00:00:00 2001 From: Haydn Trigg Date: Thu, 22 Mar 2018 09:10:39 +1030 Subject: [PATCH 2/3] Refined build script --- build/VS_scripts/build.generic.cmd | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/build/VS_scripts/build.generic.cmd b/build/VS_scripts/build.generic.cmd index a9bb179f..3f8630cc 100644 --- a/build/VS_scripts/build.generic.cmd +++ b/build/VS_scripts/build.generic.cmd @@ -19,10 +19,10 @@ GOTO build :display_help echo Syntax: build.generic.cmd msbuild_version msbuild_platform msbuild_configuration msbuild_toolset -echo msbuild_version: VS installed version (VS2012, VS2013, VS2015, ...) +echo msbuild_version: VS installed version (VS2012, VS2013, VS2015, VS2017, ...) echo msbuild_platform: Platform (x64 or Win32) echo msbuild_configuration: VS configuration (Release or Debug) -echo msbuild_toolset: Platform Toolset (v100, v110, v120, v140) +echo msbuild_toolset: Platform Toolset (v100, v110, v120, v140, v141) EXIT /B 1 @@ -34,17 +34,13 @@ SET msbuild_vs2017professional="%programfiles(x86)%\Microsoft Visual Studio\2017 SET msbuild_vs2017enterprise="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2013 SET msbuild="%programfiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" IF %msbuild_version% == VS2015 SET msbuild="%programfiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Community SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Professional SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe" -IF %msbuild_version% == VS2017Enterprise SET msbuild="%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe" -if exist %msbuild_vs2017enterprise% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017enterprise% -) -if exist %msbuild_vs2017professional% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017professional% -) -if exist %msbuild_vs2017community% ( - IF %msbuild_version% == VS2017 SET msbuild=%msbuild_vs2017community% +IF %msbuild_version% == VS2017Community SET msbuild="%msbuild_vs2017community% +IF %msbuild_version% == VS2017Professional SET msbuild=%msbuild_vs2017professional% +IF %msbuild_version% == VS2017Enterprise SET msbuild=%msbuild_vs2017enterprise% +IF %msbuild_version% == VS2017 ( + IF EXIST %msbuild_vs2017enterprise% SET msbuild=%msbuild_vs2017enterprise% + IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional% + IF EXIST %msbuild_vs2017community% SET msbuild=%msbuild_vs2017community% ) SET project="%~p0\..\VS2010\zstd.sln" From 2960f74c29b96c23d0d9ad91108060ba485e5aed Mon Sep 17 00:00:00 2001 From: Haydn Trigg Date: Mon, 26 Mar 2018 02:03:53 +1030 Subject: [PATCH 3/3] Swapped VS2017 preference order --- build/VS_scripts/build.generic.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/VS_scripts/build.generic.cmd b/build/VS_scripts/build.generic.cmd index 3f8630cc..bae42fd7 100644 --- a/build/VS_scripts/build.generic.cmd +++ b/build/VS_scripts/build.generic.cmd @@ -38,9 +38,9 @@ IF %msbuild_version% == VS2017Community SET msbuild="%msbuild_vs2017community% IF %msbuild_version% == VS2017Professional SET msbuild=%msbuild_vs2017professional% IF %msbuild_version% == VS2017Enterprise SET msbuild=%msbuild_vs2017enterprise% IF %msbuild_version% == VS2017 ( - IF EXIST %msbuild_vs2017enterprise% SET msbuild=%msbuild_vs2017enterprise% - IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional% IF EXIST %msbuild_vs2017community% SET msbuild=%msbuild_vs2017community% + IF EXIST %msbuild_vs2017professional% SET msbuild=%msbuild_vs2017professional% + IF EXIST %msbuild_vs2017enterprise% SET msbuild=%msbuild_vs2017enterprise% ) SET project="%~p0\..\VS2010\zstd.sln"