From a7c4070df74e4d62cc8031ae5de9f892fe914bfc Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Sun, 18 Jun 2017 23:41:12 -0700 Subject: scripts: Switch to manual NuGet package with both CRT linkages We'd like to build pugixml with both static & dynamic CRT and put it all in one NuGet package. CoApp sort of allows us to do this via dynamic/static pivots, but it does not let us customize the names of the pivots and additionally has some bugs with the project setup. Their project modifications are also much more complicated - really, at this point we should do this ourselves. Create a simple native NuGet package with Linkage setting that picks the right library, and package all libraries appropriately. Note that we use the unified path syntax to make it simple to just get the right .lib file from the toolset/platform/configuration/linkage combo. --- scripts/nuget.autopkg | 46 ------ .../nuget/build/native/pugixml-propertiesui.xml | 15 ++ scripts/nuget/build/native/pugixml.targets | 27 ++++ scripts/nuget/pugixml.nuspec | 20 +++ scripts/nuget_build.ps1 | 65 +++++++- scripts/pugixml_vs2015_static.vcxproj | 176 +++++++++++++++++++++ scripts/pugixml_vs2017_static.vcxproj | 176 +++++++++++++++++++++ 7 files changed, 476 insertions(+), 49 deletions(-) delete mode 100644 scripts/nuget.autopkg create mode 100644 scripts/nuget/build/native/pugixml-propertiesui.xml create mode 100644 scripts/nuget/build/native/pugixml.targets create mode 100644 scripts/nuget/pugixml.nuspec create mode 100644 scripts/pugixml_vs2015_static.vcxproj create mode 100644 scripts/pugixml_vs2017_static.vcxproj diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg deleted file mode 100644 index 27f0ec8..0000000 --- a/scripts/nuget.autopkg +++ /dev/null @@ -1,46 +0,0 @@ -configurations { - Toolset { - key: "PlatformToolset"; - choices: { v141, v140, v120, v110, v100 }; - } -} -nuget { - nuspec { - id = pugixml; - version: 1.8.0-appveyor; - - authors: {Arseny Kapoulkine}; - owners: {Arseny Kapoulkine}; - - projectUrl: "http://pugixml.org/"; - iconUrl: "https://github.com/zeux/pugixml/logo.svg"; - - title: pugixml; - summary: "Light-weight, simple and fast XML parser for C++ with XPath support"; - releaseNotes: "http://pugixml.org/docs/manual.html#changes"; - copyright: "Copyright (c) 2006-2017 Arseny Kapoulkine"; - licenseUrl: "http://pugixml.org/license.html"; - requireLicenseAcceptance: false; - - description: @"pugixml is a C++ XML processing library, which consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving). - pugixml is used by a lot of projects, both open-source and proprietary, for performance and easy-to-use interface."; - - tags: { native }; - } - files { - include: { "..\src\*.hpp" }; - - [x86,v120,release] { lib: vs2013\x32\pugixmls.lib; } - [x86,v120,debug] { lib: vs2013\x32\pugixmlsd.lib; } - [x64,v120,release] { lib: vs2013\x64\pugixmls.lib; } - [x64,v120,debug] { lib: vs2013\x64\pugixmlsd.lib; } - [x86,v140,release] { lib: vs2015\Win32_Release\pugixml.lib; } - [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/native/pugixml-propertiesui.xml b/scripts/nuget/build/native/pugixml-propertiesui.xml new file mode 100644 index 0000000..b2e02bb --- /dev/null +++ b/scripts/nuget/build/native/pugixml-propertiesui.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/scripts/nuget/build/native/pugixml.targets b/scripts/nuget/build/native/pugixml.targets new file mode 100644 index 0000000..97d13b2 --- /dev/null +++ b/scripts/nuget/build/native/pugixml.targets @@ -0,0 +1,27 @@ + + + + dynamic + + + + + + + $(MSBuildThisFileDirectory)include/;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)include/;%(AdditionalIncludeDirectories) + + + + + $(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\Debug\pugixml.lib;%(AdditionalDependencies) + + + + + $(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\Release\pugixml.lib;%(AdditionalDependencies) + + + diff --git a/scripts/nuget/pugixml.nuspec b/scripts/nuget/pugixml.nuspec new file mode 100644 index 0000000..abaa7c6 --- /dev/null +++ b/scripts/nuget/pugixml.nuspec @@ -0,0 +1,20 @@ + + + + pugixml + 1.8.0-appveyor + pugixml + Arseny Kapoulkine + Arseny Kapoulkine + false + http://pugixml.org/license.html + http://pugixml.org/ + https://github.com/zeux/pugixml/logo.svg + pugixml is a C++ XML processing library, which consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving). + pugixml is used by a lot of projects, both open-source and proprietary, for performance and easy-to-use interface. + Light-weight, simple and fast XML parser for C++ with XPath support + http://pugixml.org/docs/manual.html#changes + Copyright (c) 2006-2017 Arseny Kapoulkine + native nativepackage + + \ No newline at end of file diff --git a/scripts/nuget_build.ps1 b/scripts/nuget_build.ps1 index a8e3017..20f2d89 100644 --- a/scripts/nuget_build.ps1 +++ b/scripts/nuget_build.ps1 @@ -1,25 +1,84 @@ -function Run-Command +function Run-Command([string]$cmd) { - Invoke-Expression $args[0] + Invoke-Expression $cmd if ($LastExitCode) { exit $LastExitCode } } +function Force-Copy([string]$from, [string]$to) +{ + Write-Host $from "=>" $to + New-Item -Force $to | Out-Null + Copy-Item -Force $from $to + if (! $?) { exit 1 } +} + Push-Location $scriptdir = Split-Path $MyInvocation.MyCommand.Path cd $scriptdir +Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2013.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" + Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2013_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" + Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" + +Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2015_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" + Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" Run-Command "msbuild pugixml_vs2017.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" -Write-NuGetPackage nuget.autopkg + +Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo" +Run-Command "msbuild pugixml_vs2017_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo" + +Force-Copy "../src/pugiconfig.hpp" "nuget/build/native/include/pugiconfig.hpp" +Force-Copy "../src/pugixml.hpp" "nuget/build/native/include/pugixml.hpp" + +Force-Copy "vs2013/x32/pugixml.lib" "nuget/build/native/lib/Win32/v120/dynamic/Release/pugixml.lib" +Force-Copy "vs2013/x32/pugixmld.lib" "nuget/build/native/lib/Win32/v120/dynamic/Debug/pugixml.lib" +Force-Copy "vs2013/x64/pugixml.lib" "nuget/build/native/lib/x64/v120/dynamic/Release/pugixml.lib" +Force-Copy "vs2013/x64/pugixmld.lib" "nuget/build/native/lib/x64/v120/dynamic/Debug/pugixml.lib" + +Force-Copy "vs2013/x32/pugixmls.lib" "nuget/build/native/lib/Win32/v120/static/Release/pugixml.lib" +Force-Copy "vs2013/x32/pugixmlsd.lib" "nuget/build/native/lib/Win32/v120/static/Debug/pugixml.lib" +Force-Copy "vs2013/x64/pugixmls.lib" "nuget/build/native/lib/x64/v120/static/Release/pugixml.lib" +Force-Copy "vs2013/x64/pugixmlsd.lib" "nuget/build/native/lib/x64/v120/static/Debug/pugixml.lib" + +Force-Copy "vs2015/Win32_Release/pugixml.lib" "nuget/build/native/lib/Win32/v140/dynamic/Release/pugixml.lib" +Force-Copy "vs2015/Win32_Debug/pugixml.lib" "nuget/build/native/lib/Win32/v140/dynamic/Debug/pugixml.lib" +Force-Copy "vs2015/x64_Release/pugixml.lib" "nuget/build/native/lib/x64/v140/dynamic/Release/pugixml.lib" +Force-Copy "vs2015/x64_Debug/pugixml.lib" "nuget/build/native/lib/x64/v140/dynamic/Debug/pugixml.lib" + +Force-Copy "vs2015/Win32_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/Win32/v140/static/Release/pugixml.lib" +Force-Copy "vs2015/Win32_DebugStatic/pugixml.lib" "nuget/build/native/lib/Win32/v140/static/Debug/pugixml.lib" +Force-Copy "vs2015/x64_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/x64/v140/static/Release/pugixml.lib" +Force-Copy "vs2015/x64_DebugStatic/pugixml.lib" "nuget/build/native/lib/x64/v140/static/Debug/pugixml.lib" + +Force-Copy "vs2017/Win32_Release/pugixml.lib" "nuget/build/native/lib/Win32/v141/dynamic/Release/pugixml.lib" +Force-Copy "vs2017/Win32_Debug/pugixml.lib" "nuget/build/native/lib/Win32/v141/dynamic/Debug/pugixml.lib" +Force-Copy "vs2017/x64_Release/pugixml.lib" "nuget/build/native/lib/x64/v141/dynamic/Release/pugixml.lib" +Force-Copy "vs2017/x64_Debug/pugixml.lib" "nuget/build/native/lib/x64/v141/dynamic/Debug/pugixml.lib" + +Force-Copy "vs2017/Win32_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/Win32/v141/static/Release/pugixml.lib" +Force-Copy "vs2017/Win32_DebugStatic/pugixml.lib" "nuget/build/native/lib/Win32/v141/static/Debug/pugixml.lib" +Force-Copy "vs2017/x64_ReleaseStatic/pugixml.lib" "nuget/build/native/lib/x64/v141/static/Release/pugixml.lib" +Force-Copy "vs2017/x64_DebugStatic/pugixml.lib" "nuget/build/native/lib/x64/v141/static/Debug/pugixml.lib" + +Run-Command "nuget pack nuget" Pop-Location diff --git a/scripts/pugixml_vs2015_static.vcxproj b/scripts/pugixml_vs2015_static.vcxproj new file mode 100644 index 0000000..0ce5082 --- /dev/null +++ b/scripts/pugixml_vs2015_static.vcxproj @@ -0,0 +1,176 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {07CF01C0-B887-499D-AD9C-799CB6A9FE64} + Win32Proj + pugixml + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + vs2015\$(Platform)_$(Configuration)Static\ + vs2015\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2015\$(Platform)_$(Configuration)Static\ + vs2015\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2015\$(Platform)_$(Configuration)Static\ + vs2015\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2015\$(Platform)_$(Configuration)Static\ + vs2015\$(Platform)_$(Configuration)Static\ + pugixml + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + MultiThreadedDebug + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + MultiThreadedDebug + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + + diff --git a/scripts/pugixml_vs2017_static.vcxproj b/scripts/pugixml_vs2017_static.vcxproj new file mode 100644 index 0000000..68a862f --- /dev/null +++ b/scripts/pugixml_vs2017_static.vcxproj @@ -0,0 +1,176 @@ + + + + + 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)Static\ + vs2017\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2017\$(Platform)_$(Configuration)Static\ + vs2017\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2017\$(Platform)_$(Configuration)Static\ + vs2017\$(Platform)_$(Configuration)Static\ + pugixml + + + vs2017\$(Platform)_$(Configuration)Static\ + vs2017\$(Platform)_$(Configuration)Static\ + pugixml + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + MultiThreadedDebug + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + false + MultiThreadedDebug + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + OldStyle + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + + -- cgit v1.2.3