Try getting Windows code to build with NuGet libraries...

michaelrsweet · May 18, 2021 · df5d301 · df5d301
1 parent 77bec3f
commit df5d301
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 69 deletions.
diff --git a/vcnet/ghtmldoc.vcxproj b/vcnet/ghtmldoc.vcxproj
@@ -384,18 +384,6 @@
       <Project>{287d2fb4-9941-4b64-b973-55a6ec04eafc}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="jpeg.vcxproj">
-      <Project>{07169a72-08a9-4ec8-bc6c-ccbc1f01ea58}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="libpng.vcxproj">
-      <Project>{1132a142-f8a1-4464-881c-7f50d77a1cd2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{f4b8b6f3-8198-4fc3-92a3-c944644b570a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/vcnet/htmldoc-installer.aip b/vcnet/htmldoc-installer.aip
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="17.4" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="18.2" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="AI_CURRENT_YEAR" Value="2021" ValueLocId="-"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_ghtmldoc.exe" Value="x64\Release\ghtmldoc"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_htmldoc.exe" Value="x64\Release\htmldoc"/>
     <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_ghtmldoc.exe" Value="ghtmldoc.exe"/>
@@ -13,10 +14,10 @@
     <ROW Property="ARPPRODUCTICON" Value="htmldoc.exe" Type="8"/>
     <ROW Property="ARPURLINFOABOUT" Value="https://www.msweet.org/htmldoc"/>
     <ROW Property="Manufacturer" Value="Michael R Sweet"/>
-    <ROW Property="ProductCode" Value="1033:{B677E9E6-1277-4EAC-B5F9-9D7FF0FB7F53} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{4B1F115F-B6D6-4D95-A780-EC50A67251FE} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="HTMLDOC"/>
-    <ROW Property="ProductVersion" Value="1.9.10.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.9.12.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{4016A37E-404B-4785-B768-D4FF161DE6E9}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/vcnet/htmldoc.sln b/vcnet/htmldoc.sln
@@ -6,12 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghtmldoc", "ghtmldoc.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "htmldoc", "htmldoc.vcxproj", "{287D2FB4-9941-4B64-B973-55A6EC04EAFC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg.vcxproj", "{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcxproj", "{1132A142-F8A1-4464-881C-7F50D77A1CD2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{F4B8B6F3-8198-4FC3-92A3-C944644B570A}"
-EndProject
 Project("{840C416C-B8F3-42BC-B0DD-F6BB14C9F8CB}") = "htmldoc-installer", "htmldoc-installer.aiproj", "{D89318D0-BC34-4D85-A73D-2580C6B30CA8}"
 EndProject
 Global
@@ -58,54 +52,6 @@ Global
 		{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|Win32.Build.0 = Release|Win32
 		{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|x64.ActiveCfg = Release|x64
 		{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|x64.Build.0 = Release|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|Win32.ActiveCfg = Release|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|Win32.Build.0 = Release|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|x64.ActiveCfg = Release|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|x64.Build.0 = Release|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|Win32.Build.0 = Debug|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|x64.ActiveCfg = Debug|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|x64.Build.0 = Debug|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|Win32.Build.0 = Debug|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|x64.ActiveCfg = Debug|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|x64.Build.0 = Debug|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|Win32.ActiveCfg = Release|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|Win32.Build.0 = Release|Win32
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|x64.ActiveCfg = Release|x64
-		{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|x64.Build.0 = Release|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|Win32.ActiveCfg = Release|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|Win32.Build.0 = Release|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|x64.ActiveCfg = Release|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|x64.Build.0 = Release|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|Win32.Build.0 = Debug|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|x64.ActiveCfg = Debug|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|x64.Build.0 = Debug|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|Win32.Build.0 = Debug|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|x64.ActiveCfg = Debug|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|x64.Build.0 = Debug|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|Win32.ActiveCfg = Release|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|Win32.Build.0 = Release|Win32
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|x64.ActiveCfg = Release|x64
-		{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|x64.Build.0 = Release|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|Win32.ActiveCfg = Release|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|Win32.Build.0 = Release|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|x64.ActiveCfg = Release|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|x64.Build.0 = Release|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|Win32.Build.0 = Debug|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|x64.ActiveCfg = Debug|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|x64.Build.0 = Debug|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|Win32.Build.0 = Debug|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|x64.ActiveCfg = Debug|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|x64.Build.0 = Debug|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|Win32.ActiveCfg = Release|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|Win32.Build.0 = Release|Win32
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|x64.ActiveCfg = Release|x64
-		{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|x64.Build.0 = Release|x64
 		{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|Win32.ActiveCfg = DefaultBuild
 		{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|Win32.Build.0 = DefaultBuild
 		{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|x64.ActiveCfg = DefaultBuild

diff --git a/vcnet/htmldoc.vcxproj b/vcnet/htmldoc.vcxproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props" Condition="Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.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\native\libjpeg-turbo-v142.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -407,7 +409,26 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="any\any\zlib.static.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets" Condition="Exists('packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets')" />
+    <Import Project="packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets" Condition="Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" />
+    <Import Project="packages\zlib.static.1.2.5\build\native\zlib.static.targets" Condition="Exists('packages\zlib.static.1.2.5\build\native\zlib.static.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\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets'))" />
+    <Error Condition="!Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props'))" />
+    <Error Condition="!Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props'))" />
+    <Error Condition="!Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets'))" />
+    <Error Condition="!Exists('packages\zlib.static.1.2.5\build\native\zlib.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib.static.1.2.5\build\native\zlib.static.targets'))" />
+  </Target>
 </Project>
diff --git a/vcnet/htmldoc.vcxproj.filters b/vcnet/htmldoc.vcxproj.filters
@@ -9,6 +9,12 @@
       <UniqueIdentifier>{6d5f0e2e-804d-4c00-8307-6021e69f7392}</UniqueIdentifier>
       <Extensions>h</Extensions>
     </Filter>
+    <Filter Include="any">
+      <UniqueIdentifier>{41307285-61d1-4816-bca7-9a81137643fa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="any\any">
+      <UniqueIdentifier>{9b98c423-450f-4ef5-a796-f2ac58688dd8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\htmldoc\file.c">
@@ -131,4 +137,12 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="any\any\zlib.static.txt">
+      <Filter>any\any</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
diff --git a/vcnet/packages.config b/vcnet/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="fltk" version="1.3.3.33" targetFramework="native" />
+  <package id="libjpeg-turbo-v142" version="2.0.4.3" targetFramework="native" />
+  <package id="libpng-msvc-x64" version="1.6.33.8807" targetFramework="native" />
+  <package id="YY.NuGet.Import.Helper" version="1.0.0.4" targetFramework="native" />
+  <package id="zlib.static" version="1.2.5" targetFramework="native" />
 </packages>