From 3147190f3d652419a7f33e8110b480f36603b1ed Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Sat, 10 Oct 2015 11:42:25 -0700 Subject: scripts: Cleanup NuGet packaging Move pugixml project file for VS2015 to scripts/ and unify the output file structure similar to old VS201x projects. Remove test projects and solution since they are not required for building. Provide more accurate information in the package script and handle build errors during package construction properly. --- scripts/build_nuget_package.bat | 11 -- scripts/nuget.autopkg | 57 +++--- scripts/nuget_build.bat | 8 + scripts/pugixml_vs2015.vcxproj | 166 +++++++++++++++++ scripts/vs2015/libpugixml/libpugixml.vcxproj | 146 --------------- .../vs2015/libpugixml/libpugixml.vcxproj.filters | 33 ---- scripts/vs2015/test/test.vcxproj | 197 --------------------- scripts/vs2015/test/test.vcxproj.filters | 144 --------------- scripts/vs2015/vs2015.sln | 38 ---- 9 files changed, 195 insertions(+), 605 deletions(-) delete mode 100644 scripts/build_nuget_package.bat create mode 100644 scripts/nuget_build.bat create mode 100644 scripts/pugixml_vs2015.vcxproj delete mode 100644 scripts/vs2015/libpugixml/libpugixml.vcxproj delete mode 100644 scripts/vs2015/libpugixml/libpugixml.vcxproj.filters delete mode 100644 scripts/vs2015/test/test.vcxproj delete mode 100644 scripts/vs2015/test/test.vcxproj.filters delete mode 100644 scripts/vs2015/vs2015.sln diff --git a/scripts/build_nuget_package.bat b/scripts/build_nuget_package.bat deleted file mode 100644 index 3715832..0000000 --- a/scripts/build_nuget_package.bat +++ /dev/null @@ -1,11 +0,0 @@ -msbuild vs2015/vs2015.sln /target:Clean /property:Configuration=Debug /property:Platform=x86 -msbuild vs2015/vs2015.sln /target:Clean /property:Configuration=Debug /property:Platform=x64 -msbuild vs2015/vs2015.sln /target:Clean /property:Configuration=Release /property:Platform=x86 -msbuild vs2015/vs2015.sln /target:Clean /property:Configuration=Release /property:Platform=x64 - -msbuild vs2015/vs2015.sln /property:Configuration=Debug /property:Platform=x86 -msbuild vs2015/vs2015.sln /property:Configuration=Debug /property:Platform=x64 -msbuild vs2015/vs2015.sln /property:Configuration=Release /property:Platform=x86 -msbuild vs2015/vs2015.sln /property:Configuration=Release /property:Platform=x64 - -powershell Write-NuGetPackage nuget.autopkg diff --git a/scripts/nuget.autopkg b/scripts/nuget.autopkg index c620b57..c848d03 100644 --- a/scripts/nuget.autopkg +++ b/scripts/nuget.autopkg @@ -1,50 +1,35 @@ -nuget{ - nuspec{ +nuget { + nuspec { id = pugixml; - version : 1.6.0.1; - title: XML parser library in C++; + version: 1.7.0-alpha; + title: pugixml; authors: {Arseny Kapoulkine}; owners: {Arseny Kapoulkine}; licenseUrl: "http://pugixml.org/license.html"; projectUrl: "http://pugixml.org/"; iconUrl: "https://github.com/zeux/pugixml/logo.svg"; - requireLicenseAcceptance:false; - summary: XML parser library in C++; + requireLicenseAcceptance: false; + summary: "Light-weight, simple and fast XML parser for C++ with XPath support"; - description: @"XML parser library in C++"; + 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."; releaseNotes: "Initial release"; copyright: Copyright (c) 2006-2015 Arseny Kapoulkine; - tags: { native}; - } - dependencies { - packages : { - }; + tags: { native }; } files { - include: { "..\src\**\*.hpp" }; + include: { "..\src\*.hpp" }; - [x86,release] { - lib: vs2015\Release\libpugixml.lib; -// symbols: vs2015\Release\libpugixml.pdb; -// bin: vs2015\Release\libpugixml.dll; - } - - [x86,debug] { - lib: vs2015\Debug\libpugixml.lib; -// symbols: vs2015\Debug\libpugixml.pdb; -// bin: vs2015\Debug\libpugixml.dll; - } - - [x64,release] { - lib: vs2015\x64\Release\libpugixml.lib; -// symbols: vs2015\x64\Release\libpugixml.pdb; -// bin: vs2015\x64\Release\libpugixml.dll; - } - - [x64,debug] { - lib: vs2015\x64\Debug\libpugixml.lib; -// symbols: vs2015\x64\Debug\libpugixml.pdb; -// bin: vs2015\x64\Debug\libpugixml.dll; - } + [x86,release] { lib: vs2015\Win32_Release\pugixml.lib; symbols: vs2015\Win32_Release\pugixml.pdb; } + [x86,debug] { lib: vs2015\Win32_Debug\pugixml.lib; symbols: vs2015\Win32_Debug\pugixml.pdb; } + [x64,release] { lib: vs2015\x64_Release\pugixml.lib; symbols: vs2015\x64_Release\pugixml.pdb; } + [x64,debug] { lib: vs2015\x64_Debug\pugixml.lib; symbols: vs2015\x64_Debug\pugixml.pdb; } } } diff --git a/scripts/nuget_build.bat b/scripts/nuget_build.bat new file mode 100644 index 0000000..807f89a --- /dev/null +++ b/scripts/nuget_build.bat @@ -0,0 +1,8 @@ +@echo off + +"%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 && ^ +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 && ^ +powershell Write-NuGetPackage nuget.autopkg diff --git a/scripts/pugixml_vs2015.vcxproj b/scripts/pugixml_vs2015.vcxproj new file mode 100644 index 0000000..0788e19 --- /dev/null +++ b/scripts/pugixml_vs2015.vcxproj @@ -0,0 +1,166 @@ + + + + + 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)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + vs2015\$(Platform)_$(Configuration)\ + vs2015\$(Platform)_$(Configuration)\ + pugixml + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + + + Windows + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/scripts/vs2015/libpugixml/libpugixml.vcxproj b/scripts/vs2015/libpugixml/libpugixml.vcxproj deleted file mode 100644 index b92b1f7..0000000 --- a/scripts/vs2015/libpugixml/libpugixml.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {07CF01C0-B887-499D-AD9C-799CB6A9FE64} - Win32Proj - libpugixml - 8.1 - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Level3 - Disabled - _DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scripts/vs2015/libpugixml/libpugixml.vcxproj.filters b/scripts/vs2015/libpugixml/libpugixml.vcxproj.filters deleted file mode 100644 index 8e4201e..0000000 --- a/scripts/vs2015/libpugixml/libpugixml.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - - - Header Files - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/scripts/vs2015/test/test.vcxproj b/scripts/vs2015/test/test.vcxproj deleted file mode 100644 index 425a5d6..0000000 --- a/scripts/vs2015/test/test.vcxproj +++ /dev/null @@ -1,197 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {B137E300-AB66-4C9D-A7C9-4EF1BB344375} - Win32Proj - test - 8.1 - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {07cf01c0-b887-499d-ad9c-799cb6a9fe64} - - - - - - - - - - - \ No newline at end of file diff --git a/scripts/vs2015/test/test.vcxproj.filters b/scripts/vs2015/test/test.vcxproj.filters deleted file mode 100644 index ca01335..0000000 --- a/scripts/vs2015/test/test.vcxproj.filters +++ /dev/null @@ -1,144 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/scripts/vs2015/vs2015.sln b/scripts/vs2015/vs2015.sln deleted file mode 100644 index deaf7f6..0000000 --- a/scripts/vs2015/vs2015.sln +++ /dev/null @@ -1,38 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpugixml", "libpugixml\libpugixml.vcxproj", "{07CF01C0-B887-499D-AD9C-799CB6A9FE64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{B137E300-AB66-4C9D-A7C9-4EF1BB344375}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x64.ActiveCfg = Debug|x64 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x64.Build.0 = Debug|x64 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x86.ActiveCfg = Debug|Win32 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Debug|x86.Build.0 = Debug|Win32 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.ActiveCfg = Release|x64 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.Build.0 = Release|x64 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.ActiveCfg = Release|Win32 - {07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x86.Build.0 = Release|Win32 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Debug|x64.ActiveCfg = Debug|x64 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Debug|x64.Build.0 = Debug|x64 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Debug|x86.ActiveCfg = Debug|Win32 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Debug|x86.Build.0 = Debug|Win32 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Release|x64.ActiveCfg = Release|x64 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Release|x64.Build.0 = Release|x64 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Release|x86.ActiveCfg = Release|Win32 - {B137E300-AB66-4C9D-A7C9-4EF1BB344375}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal -- cgit v1.2.3