From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 31 Jul 2021 01:22:39 +0000 (-0400)
Subject: Try using .targets file in NuGet package.
X-Git-Tag: v2.4b1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63d9e68c92f2285d22cbdba46c5d97d67310a5e;p=thirdparty%2Fcups.git

Try using .targets file in NuGet package.

Tweak spec files.
---

diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec
index 1e993cfa89..9b70d85f40 100644
--- a/vcnet/libcups2_native.nuspec
+++ b/vcnet/libcups2_native.nuspec
@@ -3,38 +3,39 @@
     <metadata>
         <id>libcups2_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>2.4.0-b0</version>
+        <version>2.4.0-b00</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
         <license type="expression">Apache-2.0</license>
-        <icon>native/cups-128.png</icon>
+        <icon>build/native/cups-128.png</icon>
+        <readme>build/native/README.md</readme>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>OpenPrinting CUPS library for VS2019+</description>
-        <summary>OpenPrinting CUPS is a standards-based, open source printing system for Linux®
-and other Unix®-like operating systems. The CUPS library provides a convenient API for communicating with Internet Printing Protocol printers. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
+        <description>OpenPrinting CUPS is a standards-based, open source printing system for Linux®
+and other Unix®-like operating systems. The CUPS library provides a convenient API for communicating with Internet Printing Protocol printers. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</description>
         <copyright>Copyright © 2020-2021 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
-	    <dependency id="libcups2_native.redist" version="2.4.0-b0" />
+	    <dependency id="libcups2_native.redist" version="2.4.0-b00" />
 	</dependencies>
     </metadata>
     <files>
-        <file src="..\desktop\cups-128.png" target="native" />
-        <file src="..\README.md" target="native" />
-        <file src="libcups2_native.props" target="native" />
-        <file src="..\cups\array.h" target="native\include\cups" />
-        <file src="..\cups\cups.h" target="native\include\cups" />
-        <file src="..\cups\dir.h" target="native\include\cups" />
-        <file src="..\cups\file.h" target="native\include\cups" />
-        <file src="..\cups\http.h" target="native\include\cups" />
-        <file src="..\cups\ipp.h" target="native\include\cups" />
-        <file src="..\cups\language.h" target="native\include\cups" />
-        <file src="..\cups\pwg.h" target="native\include\cups" />
-        <file src="..\cups\raster.h" target="native\include\cups" />
-        <file src="..\cups\transcode.h" target="native\include\cups" />
-        <file src="..\cups\versioning.h" target="native\include\cups" />
-        <!--<file src="Win32\**\libcups2*.lib" target="native\lib\Win32" />-->
-        <file src="x64\**\libcups2*.lib" target="native\lib\x64" />
+        <file src="..\desktop\cups-128.png" target="build\native" />
+        <file src="..\README.md" target="build\native" />
+        <file src="libcups2_native.props" target="build\native" />
+        <file src="libcups2_native.targets" target="build\native" />
+        <file src="..\cups\array.h" target="build\native\include\cups" />
+        <file src="..\cups\cups.h" target="build\native\include\cups" />
+        <file src="..\cups\dir.h" target="build\native\include\cups" />
+        <file src="..\cups\file.h" target="build\native\include\cups" />
+        <file src="..\cups\http.h" target="build\native\include\cups" />
+        <file src="..\cups\ipp.h" target="build\native\include\cups" />
+        <file src="..\cups\language.h" target="build\native\include\cups" />
+        <file src="..\cups\pwg.h" target="build\native\include\cups" />
+        <file src="..\cups\raster.h" target="build\native\include\cups" />
+        <file src="..\cups\transcode.h" target="build\native\include\cups" />
+        <file src="..\cups\versioning.h" target="build\native\include\cups" />
+        <!--<file src="Win32\**\libcups2*.lib" target="build\native\lib\Win32" />-->
+        <file src="x64\**\libcups2*.lib" target="build\native\lib\x64" />
     </files>
 </package>
diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec
index 38a20962b1..17955a4093 100644
--- a/vcnet/libcups2_native.redist.nuspec
+++ b/vcnet/libcups2_native.redist.nuspec
@@ -3,16 +3,16 @@
     <metadata>
         <id>libcups2_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>2.4.0-b0</version>
+        <version>2.4.0-b00</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
         <license type="expression">Apache-2.0</license>
-        <icon>native/cups-128.png</icon>
+        <icon>build/native/cups-128.png</icon>
+        <readme>build/native/README.md</readme>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Redistributable components for package 'libcups2_native'. This package should only be installed as a dependency.</description>
-        <summary>OpenPrinting CUPS is a standards-based, open source printing system for Linux®
-and other Unix®-like operating systems. This package provides the redistributable content for the CUPS library. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</summary>
+        <description>OpenPrinting CUPS is a standards-based, open source printing system for Linux®
+and other Unix®-like operating systems. This package provides the redistributable content for the CUPS library. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</description>
         <copyright>Copyright © 2020-2021 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
@@ -20,11 +20,11 @@ and other Unix®-like operating systems. This package provides the redistributab
 	</dependencies>
     </metadata>
     <files>
-        <file src="..\desktop\cups-128.png" target="native" />
-        <file src="..\README.md" target="native" />
-        <!--<file src="Win32\**\libcups2*.dll" target="native\bin\Win32" />
-        <file src="Win32\**\regex*.dll" target="native\bin\Win32" />-->
-        <file src="x64\**\libcups2*.dll" target="native\bin\x64" />
-        <file src="x64\**\regex*.dll" target="native\bin\x64" />
+        <file src="..\desktop\cups-128.png" target="build\native" />
+        <file src="..\README.md" target="build\native" />
+        <!--<file src="Win32\**\libcups2*.dll" target="build\native\bin\Win32" />
+        <file src="Win32\**\regex*.dll" target="build\native\bin\Win32" />-->
+        <file src="x64\**\libcups2*.dll" target="build\native\bin\x64" />
+        <file src="x64\**\regex*.dll" target="build\native\bin\x64" />
     </files>
 </package>
diff --git a/vcnet/libcups2_native.targets b/vcnet/libcups2_native.targets
new file mode 100644
index 0000000000..192513b1c1
--- /dev/null
+++ b/vcnet/libcups2_native.targets
@@ -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'">libcups2d</LibraryName>
+    <LibraryName Condition="'$(Configuration)'=='Release'">libcups2</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>