From 4d6556100fdda1631df8d376d066020111ec5934 Mon Sep 17 00:00:00 2001 From: Stephen Daudell Date: Thu, 4 Aug 2016 14:30:25 -0500 Subject: Update Nuget autopkg. Include more configurations in the Nuget package. --- scripts/nuget.autopkg | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg index b42d76b..de1920a 100644 --- a/scripts/nuget.autopkg +++ b/scripts/nuget.autopkg @@ -24,9 +24,13 @@ nuget { files { include: { "..\src\*.hpp" }; - [x86,release] { lib: vs2015\Win32_Release\pugixml.lib; } - [x86,debug] { lib: vs2015\Win32_Debug\pugixml.lib; } - [x64,release] { lib: vs2015\x64_Release\pugixml.lib; } - [x64,debug] { lib: vs2015\x64_Debug\pugixml.lib; } + [x86,v120,static,release] { lib: vs2013\x32\pugixmls.lib; } + [x86,v120,static,debug] { lib: vs2013\x32\pugixmlsd.lib; } + [x64,v120,static,release] { lib: vs2013\x64\pugixmls.lib; } + [x64,v120,static,debug] { lib: vs2013\x64\pugixmlsd.lib; } + [x86,v140,static,release] { lib: vs2015\Win32_Release\pugixml.lib; } + [x86,v140,static,debug] { lib: vs2015\Win32_Debug\pugixml.lib; } + [x64,v140,static,release] { lib: vs2015\x64_Release\pugixml.lib; } + [x64,v140,static,debug] { lib: vs2015\x64_Debug\pugixml.lib; } } } -- cgit v1.2.3 From afe73da928005f53ec0a2ce2f53c9e6120290285 Mon Sep 17 00:00:00 2001 From: Stephen Daudell Date: Thu, 4 Aug 2016 14:36:44 -0500 Subject: Expand build to include VS 2013. --- scripts/nuget_build.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index ab3c984..cf942ea 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -1,6 +1,12 @@ @echo off cd %~dp0 +"%VS120COMNTOOLS%\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 + "%VS140COMNTOOLS%\VsMSBuildCmd.bat" && ^ 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 && ^ -- cgit v1.2.3 From 97a6f65200bc61a5a5bec657a835f33ec902aab7 Mon Sep 17 00:00:00 2001 From: Stephen Daudell Date: Thu, 4 Aug 2016 14:53:47 -0500 Subject: Potential fix for build issues. --- scripts/nuget_build.bat | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index cf942ea..588f036 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -1,13 +1,11 @@ @echo off cd %~dp0 -"%VS120COMNTOOLS%\VsMSBuildCmd.bat" && ^ +"%VS140COMNTOOLS%\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 - -"%VS140COMNTOOLS%\VsMSBuildCmd.bat" && ^ +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 && ^ -- cgit v1.2.3 From ae984fbd540ebdb2dde060413182d4298fabf6b3 Mon Sep 17 00:00:00 2001 From: Stephen Daudell Date: Thu, 4 Aug 2016 14:56:52 -0500 Subject: Add custom toolset choices. --- scripts/nuget.autopkg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg index de1920a..787216e 100644 --- a/scripts/nuget.autopkg +++ b/scripts/nuget.autopkg @@ -1,3 +1,11 @@ +configurations { + // This node contains custom pivot information. + Toolset + { + key: "PlatformToolset"; + choices: { v140, v120, v110, v100 }; + } +} nuget { nuspec { id = pugixml; -- cgit v1.2.3