From 1d22369c5ec3f41573603d9d24e4c885def14c81 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 26 Jul 2021 18:42:16 -0400 Subject: [PATCH 1/4] Add Windows CI target. --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a27abc7..6741f35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,3 +40,12 @@ 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: devenv + run: devenv pdfio.sln /build From d2e8f5e2638f9ee6bb86551c1ac863fa64867a6c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 26 Jul 2021 20:56:28 -0400 Subject: [PATCH 2/4] Add setup-msbuild step, use msbuild. --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6741f35..841107d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,5 +47,7 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 - name: devenv - run: devenv pdfio.sln /build + run: msbuild pdfio.sln From ac4620b808b0a9f9b1b31433b694cba80ee9f084 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 26 Jul 2021 21:37:06 -0400 Subject: [PATCH 3/4] Add nuget resource step. --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 841107d..94e23f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Add msbuild to PATH + - name: setup-msbuild uses: microsoft/setup-msbuild@v1.0.2 - - name: devenv + - name: nuget restore + run: nuget restore pdfio.sln + - name: msbuild run: msbuild pdfio.sln From 2c7d7cf768e0de9c42207dd4ee427f09c152e1c0 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 30 Jul 2021 20:33:21 -0400 Subject: [PATCH 4/4] 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 @@  - + + \ 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 @@ - + + 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}. - + + \ 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 @@ + + + + pdfio_native + PDFio Library for VS2019+ + 1.0-b0 + Michael R Sweet + michaelrsweet + https://github.com/michaelrsweet/pappl + Apache-2.0 + native/pdfio-128.png + false + PDFio Library for VS2019+ + 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. + Copyright © 2019-2021 by Michael R Sweet + pdf file native + + + + + + + + + + + + + + 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 @@ + + + + pappld + pappl + + + + + + $(MSBuildThisFileDirectory)\include + + @$(LinkLibrary);%(AdditionalDependencies) + + + 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 @@ + + + + pdfio_native.redist + PDFio Library for VS2019+ Redist + 1.0-b0 + Michael R Sweet + michaelrsweet + https://github.com/michaelrsweet/pappl + Apache-2.0 + native/pdfio-128.png + false + Redistributable components for package 'pdfio_native'. This package should only be installed as a dependency. + 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. + Copyright © 2021 by Michael R Sweet + pdf file native + + + + + + + + + + + diff --git a/testpdfio.vcxproj b/testpdfio.vcxproj index a88eef2..778fddc 100644 --- a/testpdfio.vcxproj +++ b/testpdfio.vcxproj @@ -153,12 +153,14 @@ - + + 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}. - + + \ No newline at end of file