From c7131b01f990930a8d2f74ac01d27c6a66800796 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 10:59:33 +0300 Subject: VS2017 project --- scripts/nuget.autopkg | 6 +- scripts/nuget_build.bat | 4 + scripts/pugixml_vs2017.vcxproj | 172 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 scripts/pugixml_vs2017.vcxproj diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg index 2a620a2..27f0ec8 100644 --- a/scripts/nuget.autopkg +++ b/scripts/nuget.autopkg @@ -1,7 +1,7 @@ configurations { Toolset { key: "PlatformToolset"; - choices: { v140, v120, v110, v100 }; + choices: { v141, v140, v120, v110, v100 }; } } nuget { @@ -38,5 +38,9 @@ nuget { [x86,v140,debug] { lib: vs2015\Win32_Debug\pugixml.lib; } [x64,v140,release] { lib: vs2015\x64_Release\pugixml.lib; } [x64,v140,debug] { lib: vs2015\x64_Debug\pugixml.lib; } + [x86,v141,release] { lib: vs2017\Win32_Release\pugixml.lib; } + [x86,v141,debug] { lib: vs2017\Win32_Debug\pugixml.lib; } + [x64,v141,release] { lib: vs2017\x64_Release\pugixml.lib; } + [x64,v141,debug] { lib: vs2017\x64_Debug\pugixml.lib; } } } diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index 588f036..8fb2bb7 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -10,4 +10,8 @@ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ powershell Write-NuGetPackage nuget.autopkg diff --git a/scripts/pugixml_vs2017.vcxproj b/scripts/pugixml_vs2017.vcxproj new file mode 100644 index 0000000..c1c9745 --- /dev/null +++ b/scripts/pugixml_vs2017.vcxproj @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {07CF01C0-B887-499D-AD9C-799CB6A9FE64} + Win32Proj + pugixml + 8.1 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + vs2017\$(Platform)_$(Configuration)\ + vs2017\$(Platform)_$(Configuration)\ + pugixml + + + vs2017\$(Platform)_$(Configuration)\ + vs2017\$(Platform)_$(Configuration)\ + pugixml + + + vs2017\$(Platform)_$(Configuration)\ + vs2017\$(Platform)_$(Configuration)\ + pugixml + + + vs2017\$(Platform)_$(Configuration)\ + vs2017\$(Platform)_$(Configuration)\ + pugixml + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + + + Windows + true + true + true + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 3a8073cca22af01f1eb30b145c065eaad40b1f5b Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:05:28 +0300 Subject: Appveyor image set to VS2017 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index eaf1aee..80e9386 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +os: Visual Studio 2017 + version: "{branch}-{build}" install: -- cgit v1.2.3 From d8f9148d367c3d2a36eca263bce662fdcf60f518 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:11:36 +0300 Subject: set v141 tools environment for building --- appveyor.yml | 2 -- scripts/nuget_build.bat | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 80e9386..eaf1aee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,3 @@ -os: Visual Studio 2017 - version: "{branch}-{build}" install: diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index 8fb2bb7..61c605a 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -10,6 +10,7 @@ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ +"%VS141COMNTOOLS%\VsMSBuildCmd.bat" && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ -- cgit v1.2.3 From 042eae4c8353ab10ae2b0fa761259714a98285cb Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:14:28 +0300 Subject: Appveyor image set to VS2017 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index eaf1aee..80e9386 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +os: Visual Studio 2017 + version: "{branch}-{build}" install: -- cgit v1.2.3 From e9446237809c4c700d728e46c8bb5c04c6e99415 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:17:34 +0300 Subject: Appveyor image set to VS2017 --- scripts/nuget_build.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index 61c605a..833c95e 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -1,7 +1,7 @@ @echo off cd %~dp0 -"%VS140COMNTOOLS%\VsMSBuildCmd.bat" && ^ +"%VS141COMNTOOLS%\VsMSBuildCmd.bat" && ^ msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ @@ -10,7 +10,6 @@ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ -"%VS141COMNTOOLS%\VsMSBuildCmd.bat" && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ -- cgit v1.2.3 From 4dc10541040d9da4389f2a5da62330bab570e8b8 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:32:46 +0300 Subject: use powershell instead of cmd --- appveyor.yml | 2 +- scripts/nuget_build.bat | 17 ----------------- scripts/nuget_build.ps1 | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 18 deletions(-) delete mode 100644 scripts/nuget_build.bat create mode 100644 scripts/nuget_build.ps1 diff --git a/appveyor.yml b/appveyor.yml index 80e9386..20c502b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ install: - ps: Import-Module CoApp build_script: - - ps: .\scripts\nuget_build.bat + - ps: .\scripts\nuget_build.ps1 test_script: - ps: .\tests\autotest-appveyor.ps1 diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat deleted file mode 100644 index 833c95e..0000000 --- a/scripts/nuget_build.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -cd %~dp0 - -"%VS141COMNTOOLS%\VsMSBuildCmd.bat" && ^ -msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ -msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ -msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ -msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ -msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^ -msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^ -msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^ -powershell Write-NuGetPackage nuget.autopkg diff --git a/scripts/nuget_build.ps1 b/scripts/nuget_build.ps1 new file mode 100644 index 0000000..bcb774f --- /dev/null +++ b/scripts/nuget_build.ps1 @@ -0,0 +1,33 @@ +Push-Location +$scriptdir = Split-Path $MyInvocation.MyCommand.Path +cd $scriptdir + +"%VS141COMNTOOLS%\VsMSBuildCmd.bat" +msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo +If(!$?){exit 1} +Write-NuGetPackage nuget.autopkg +If(!$?){exit 1} + +Pop-Location -- cgit v1.2.3 From b66ca4f3266d4b092bd358b7227d628fc6cb14fe Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 15 Jun 2017 11:49:10 +0300 Subject: use 2 images to build on appveyor --- appveyor.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 20c502b..a42990f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ -os: Visual Studio 2017 +image: +- Visual Studio 2015 +- Visual Studio 2017 version: "{branch}-{build}" @@ -9,10 +11,10 @@ install: - ps: Import-Module CoApp build_script: - - ps: .\scripts\nuget_build.ps1 + - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017"){.\scripts\nuget_build.ps1} test_script: - - ps: .\tests\autotest-appveyor.ps1 + - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015"){.\tests\autotest-appveyor.ps1} artifacts: - path: .\scripts\*.nupkg \ No newline at end of file -- cgit v1.2.3