diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2016-08-07 09:06:41 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 09:06:41 -0700 | 
| commit | 55cea93e6c131bdd73e7bab13539f33baab449b1 (patch) | |
| tree | 034afca5feec4ddc8b270e3ec4b54525b45f7c19 | |
| parent | bda8b72f81d5cf29bc4a5f77229f81e4cd07eb7f (diff) | |
| parent | ae984fbd540ebdb2dde060413182d4298fabf6b3 (diff) | |
Merge pull request #108 from steji113/master
scripts: Add VS2013 static builds to nuget package
| -rw-r--r-- | scripts/nuget.autopkg | 20 | ||||
| -rw-r--r-- | scripts/nuget_build.bat | 4 | 
2 files changed, 20 insertions, 4 deletions
| diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg index b42d76b..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; @@ -24,9 +32,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; }  	}  } diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat index ab3c984..588f036 100644 --- a/scripts/nuget_build.bat +++ b/scripts/nuget_build.bat @@ -2,6 +2,10 @@  cd %~dp0  "%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 && ^  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 && ^ | 
