diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a9e2508..ba5e6ca4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,4 +64,4 @@ jobs: - name: msbuild run: cd vcnet; msbuild pappl.sln - name: test - run: cd vcnet; ./copy-dlls.bat x64\Debug; cd x64\Debug; ./testpappl -c -l testpappl.log -L debug -o testpappl.output -t all + run: cd vcnet; ./copy-dlls.bat x64\Debug; cd x64\Debug; ./testpappl -c -l testpappl.log -o testpappl.output -t all diff --git a/vcnet/copy-dlls.bat b/vcnet/copy-dlls.bat index 00f2cd6a..95c164fe 100644 --- a/vcnet/copy-dlls.bat +++ b/vcnet/copy-dlls.bat @@ -1,7 +1,8 @@ :: Script to copy dependent DLLs to the named build directory -copy packages\libcups2_native.redist.2.4.3.1\build\native\bin\x64\Debug\*.dll %1 +copy packages\libcups2_native.redist.2.4.3.3\build\native\bin\x64\Debug\*.dll %1 copy packages\libjpeg-turbo-v142.2.0.4.3\build\native\bin\x64\v142\Debug\*.dll %1 copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Debug\*.dll %1 copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Release\*.dll %1 +copy packages\libressl_native.redist.3.5.3.2\build\native\bin\x64\Debug\*.dll %1 copy packages\zlib_native.redist.1.2.11\build\native\bin\x64\Debug\*.dll %1 copy packages\zlib_native.redist.1.2.11\build\native\bin\x64\Release\*.dll %1 diff --git a/vcnet/libpappl1.vcxproj b/vcnet/libpappl1.vcxproj index bebe7444..abd8b9c3 100644 --- a/vcnet/libpappl1.vcxproj +++ b/vcnet/libpappl1.vcxproj @@ -1,6 +1,6 @@  - + @@ -60,7 +60,7 @@ Disabled - packages\libpng_native.1.6.30\build\native\include;packages\libjpeg-turbo-v142.2.0.4.3\build\native\include;packages\libressl_native.3.5.3.1\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories) + packages\libpng_native.1.6.30\build\native\include;packages\libjpeg-turbo-v142.2.0.4.3\build\native\include;packages\libressl_native.3.5.3.2\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBPAPPL1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -70,7 +70,7 @@ ProgramDatabase - packages\libcups2_native.2.4.3.1\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libcups2_native.2.4.3.3\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) $(OutDir)libpappl1.dll ..\pappl\libpappl1.def true @@ -86,7 +86,7 @@ MinSpace - packages\libpng_native.1.6.30\build\native\include;packages\libjpeg-turbo-v142.2.0.4.3\build\native\include;packages\libressl_native.3.5.3.1\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories) + packages\libpng_native.1.6.30\build\native\include;packages\libjpeg-turbo-v142.2.0.4.3\build\native\include;packages\libressl_native.3.5.3.2\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories) DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBPAPPL1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ ProgramDatabase - packages\libcups2_native.2.4.3.1\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Release\libpng16.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libcups2_native.2.4.3.3\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Release\libpng16.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) $(OutDir)libpappl1.dll ..\pappl\libpappl1.def true @@ -207,6 +207,6 @@ - + \ No newline at end of file diff --git a/vcnet/libpappl1_native.nuspec b/vcnet/libpappl1_native.nuspec index bf543058..a170a000 100644 --- a/vcnet/libpappl1_native.nuspec +++ b/vcnet/libpappl1_native.nuspec @@ -17,7 +17,7 @@ Applications, which are the recommended replacement for printer drivers. PAPPL i Copyright © 2019-2022 by Michael R Sweet airprint everywhere http ipp mopria native - + diff --git a/vcnet/libpappl1_native.redist.nuspec b/vcnet/libpappl1_native.redist.nuspec index ea86ff90..88da682a 100644 --- a/vcnet/libpappl1_native.redist.nuspec +++ b/vcnet/libpappl1_native.redist.nuspec @@ -17,9 +17,10 @@ Applications, which are the recommended replacement for printer drivers. This pa Copyright © 2019-2022 by Michael R Sweet airprint everywhere http ipp mopria native - + + diff --git a/vcnet/packages.config b/vcnet/packages.config index a9666046..811f9f11 100644 --- a/vcnet/packages.config +++ b/vcnet/packages.config @@ -1,12 +1,12 @@  - - + + - - + + \ No newline at end of file diff --git a/vcnet/testpappl.vcxproj b/vcnet/testpappl.vcxproj index b49212c8..a9342051 100644 --- a/vcnet/testpappl.vcxproj +++ b/vcnet/testpappl.vcxproj @@ -1,6 +1,6 @@  - + @@ -73,7 +73,7 @@ false - packages\libcups2_native.2.4.3.1\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libcups2_native.2.4.3.3\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) @@ -96,7 +96,7 @@ false - packages\libcups2_native.2.4.3.1\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libcups2_native.2.4.3.3\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) @@ -129,6 +129,6 @@ - + \ No newline at end of file