Update VC/NuGet files.

michaelrsweet · Sep 21, 2022 · 402d854 · 402d854
1 parent e0c6cf1
commit 402d854
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props')" />
+  <Import Project="packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props')" />
   <Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\nativelinjpeg-turbo-v142.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -60,7 +60,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <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.1\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBPAPPL1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -70,7 +70,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <OutputFile>$(OutDir)libpappl1.dll</OutputFile>
       <ModuleDefinitionFile>..\pappl\libpappl1.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -86,15 +86,15 @@
     </Midl>
     <ClCompile>
       <Optimization>MinSpace</Optimization>
-      <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.1\build\native\include;..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBPAPPL1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <OutputFile>$(OutDir)libpappl1.dll</OutputFile>
       <ModuleDefinitionFile>..\pappl\libpappl1.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -207,6 +207,6 @@
     </PropertyGroup>
     <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'))" />
-    <Error Condition="!Exists('packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props'))" />
+    <Error Condition="!Exists('packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props'))" />
   </Target>
 </Project>
diff --git 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>Copyright © 2019-2022 by Michael R Sweet</copyright>
         <tags>airprint everywhere http ipp mopria native</tags>
 	<dependencies>
-	    <dependency id="libcups2_native" version="2.4.3.1" />
+	    <dependency id="libcups2_native" version="2.4.3.3" />
 	    <dependency id="libpappl1_native.redist" version="1.2.2" />
 	</dependencies>
     </metadata>

diff --git 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>Copyright © 2019-2022 by Michael R Sweet</copyright>
         <tags>airprint everywhere http ipp mopria native</tags>
 	<dependencies>
-	    <dependency id="libcups2_native.redist" version="2.4.3.1" />
+	    <dependency id="libcups2_native.redist" version="2.4.3.3" />
 	    <dependency id="libjpeg-turbo-v142" version="2.0.4.3" />
 	    <dependency id="libpng_native.redist" version="1.6.30" />
+	    <dependency id="libressl_native.redist" version="3.5.3.2" />
 	    <dependency id="zlib_native.redist" version="1.2.11" />
 	</dependencies>
     </metadata>

diff --git a/vcnet/packages.config b/vcnet/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="libcups2_native" version="2.4.3.1" targetFramework="native" />
-  <package id="libcups2_native.redist" version="2.4.3.1" targetFramework="native" />
+  <package id="libcups2_native" version="2.4.3.3" targetFramework="native" />
+  <package id="libcups2_native.redist" version="2.4.3.3" targetFramework="native" />
   <package id="libjpeg-turbo-v142" version="2.0.4.3" targetFramework="native" />
-  <package id="libressl_native" version="3.5.3.1" targetFramework="native" />
-  <package id="libressl_native.redist" version="3.5.3.1" targetFramework="native" />
   <package id="libpng_native" version="1.6.30" targetFramework="native" />
   <package id="libpng_native.redist" version="1.6.30" targetFramework="native" />
+  <package id="libressl_native" version="3.5.3.2" targetFramework="native" />
+  <package id="libressl_native.redist" version="3.5.3.2" targetFramework="native" />
   <package id="zlib_native" version="1.2.11" targetFramework="native" />
   <package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
 </packages>
diff --git a/vcnet/testpappl.vcxproj b/vcnet/testpappl.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props')" />
+  <Import Project="packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props')" />
   <Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\nativelinjpeg-turbo-v142.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -73,7 +73,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -96,7 +96,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -129,6 +129,6 @@
     <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'))" />
     <Error Condition="!Exists('packages\libpng_native.redist.1.6.30\build\native\libpng_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng_native.redist.1.6.30\build\native\libpng_native.redist.targets'))" />
     <Error Condition="!Exists('packages\libpng_native.1.6.30\build\native\libpng_native.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng_native.1.6.30\build\native\libpng_native.targets'))" />
-    <Error Condition="!Exists('packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.3.1\build\native\libcups2_native.props'))" />
+    <Error Condition="!Exists('packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.3.3\build\native\libcups2_native.props'))" />
   </Target>
 </Project>