From 2c7d7cf768e0de9c42207dd4ee427f09c152e1c0 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Fri, 30 Jul 2021 20:33:21 -0400
Subject: [PATCH] Add initial Nuget packaging files.

Use zlib_native instead of zlib-msvc-v140.
---
 doc/pdfio-128.png          | Bin 0 -> 4256 bytes
 packages.config            |   3 ++-
 pdfio.vcxproj              |   6 ++++--
 pdfio_native.nuspec        |  30 ++++++++++++++++++++++++++++++
 pdfio_native.props         |  16 ++++++++++++++++
 pdfio_native.redist.nuspec |  27 +++++++++++++++++++++++++++
 testpdfio.vcxproj          |   6 ++++--
 7 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 doc/pdfio-128.png
 create mode 100644 pdfio_native.nuspec
 create mode 100644 pdfio_native.props
 create mode 100644 pdfio_native.redist.nuspec

diff --git a/doc/pdfio-128.png b/doc/pdfio-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41e127aa4c16ef6ca03f2d72261b1aa62073de8
GIT binary patch
literal 4256
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
D?|%U$

literal 0
HcmV?d00001

diff --git a/packages.config b/packages.config
index 56146d7..ddf68c6 100644
--- a/packages.config
+++ b/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zlib-msvc-x64" version="1.2.11.8900" targetFramework="native" />
+  <package id="zlib_native" version="1.2.11" targetFramework="native" />
+  <package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/pdfio.vcxproj b/pdfio.vcxproj
index 05a2b99..257b9b4 100644
--- a/pdfio.vcxproj
+++ b/pdfio.vcxproj
@@ -167,12 +167,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
+    <Import Project="packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets" Condition="Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" />
+    <Import Project="packages\zlib_native.1.2.11\build\native\zlib_native.targets" Condition="Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
+    <Error Condition="!Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets'))" />
+    <Error Condition="!Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.1.2.11\build\native\zlib_native.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/pdfio_native.nuspec b/pdfio_native.nuspec
new file mode 100644
index 0000000..3a3b7b5
--- /dev/null
+++ b/pdfio_native.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>pdfio_native</id>
+        <title>PDFio Library for VS2019+</title>
+        <version>1.0-b0</version>
+        <authors>Michael R Sweet</authors>
+        <owners>michaelrsweet</owners>
+        <projectUrl>https://github.com/michaelrsweet/pappl</projectUrl>
+        <license type="expression">Apache-2.0</license>
+        <icon>native/pdfio-128.png</icon>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>PDFio Library for VS2019+</description>
+        <summary>PDFio is a simple C library for reading and writing PDF files. PDFio is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
+        <copyright>Copyright © 2019-2021 by Michael R Sweet</copyright>
+        <tags>pdf file native</tags>
+	<dependencies>
+	    <dependency id="pdfio_native.redist" version="1.0-b0" />
+	</dependencies>
+    </metadata>
+    <files>
+        <file src="doc\pdfio-128.png" target="native" />
+        <file src="README.md" target="native" />
+        <file src="pdfio_native.props" target="native" />
+        <file src="pdfio.h" target="native\include" />
+        <file src="pdfio-content.h" target="native\include" />
+        <!--<file src="Win32\**\pdfio*.lib" target="native\lib\Win32" />-->
+        <file src="x64\**\pdfio*.lib" target="native\lib\x64" />
+    </files>
+</package>
diff --git a/pdfio_native.props b/pdfio_native.props
new file mode 100644
index 0000000..c2fcd75
--- /dev/null
+++ b/pdfio_native.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <PropertyGroup>
+    <LibraryName Condition="'$(Configuration)'=='Debug'">pappld</LibraryName>
+    <LibraryName Condition="'$(Configuration)'=='Release'">pappl</LibraryName>
+  </PropertyGroup>
+  <ItemGroup>
+    <LinkLibrary Include="$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\$(LibraryName).lib" />
+  </ItemGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>   <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories></ClCompile>
+    <Link>
+      <AdditionalDependencies>@$(LinkLibrary);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/pdfio_native.redist.nuspec b/pdfio_native.redist.nuspec
new file mode 100644
index 0000000..d7fe99d
--- /dev/null
+++ b/pdfio_native.redist.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>pdfio_native.redist</id>
+        <title>PDFio Library for VS2019+ Redist</title>
+        <version>1.0-b0</version>
+        <authors>Michael R Sweet</authors>
+        <owners>michaelrsweet</owners>
+        <projectUrl>https://github.com/michaelrsweet/pappl</projectUrl>
+        <license type="expression">Apache-2.0</license>
+        <icon>native/pdfio-128.png</icon>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Redistributable components for package 'pdfio_native'. This package should only be installed as a dependency.</description>
+        <summary>PDFio is a simple C library for reading and writing PDF files. This package provides the redistributable content for PDFio. PDFio is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
+        <copyright>Copyright © 2021 by Michael R Sweet</copyright>
+        <tags>pdf file native</tags>
+	<dependencies>
+	    <dependency id="zlib_native.redist" version="1.2.11" />
+	</dependencies>
+    </metadata>
+    <files>
+        <file src="doc\pdfio-128.png" target="native" />
+        <file src="README.md" target="native" />
+        <!--<file src="Win32\**\pdfio*.dll" target="native\bin\Win32" />-->
+        <file src="x64\**\pdfio.dll" target="native\bin\x64" />
+    </files>
+</package>
diff --git a/testpdfio.vcxproj b/testpdfio.vcxproj
index a88eef2..778fddc 100644
--- a/testpdfio.vcxproj
+++ b/testpdfio.vcxproj
@@ -153,12 +153,14 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
+    <Import Project="packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets" Condition="Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" />
+    <Import Project="packages\zlib_native.1.2.11\build\native\zlib_native.targets" Condition="Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
+    <Error Condition="!Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets'))" />
+    <Error Condition="!Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.1.2.11\build\native\zlib_native.targets'))" />
   </Target>
 </Project>
\ No newline at end of file