Merge branch 'master' of github.com:michaelrsweet/pdfio

.github/workflows/build.yml

@@ -40,3 +40,16 @@ jobs:
       run: make test
     - name: clang static analyzer
       run: make CC=clang "GHA_ERROR=::error::" clang
+
+  build-windows:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup-msbuild
+      uses: microsoft/setup-msbuild@v1.0.2
+    - name: nuget restore
+      run: nuget restore pdfio.sln
+    - name: msbuild
+      run: msbuild pdfio.sln

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>

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>

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>

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>

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>

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>