From 3d9d0e5f8d000045fbd207c24ed0df7faa5386f5 Mon Sep 17 00:00:00 2001
From: Jerome Haltom <jhaltom@alethic.solutions>
Date: Sat, 2 Sep 2023 18:21:32 -0500
Subject: [PATCH] Add an empty libawt for binding. MSBuild.Tasks.Tests ignore
 duplicates.

---
 IKVM.sln                                         |  6 ++++++
 src/IKVM.Image-bin/IKVM.Image-bin.csproj         |  1 +
 .../IKVM.MSBuild.Tasks.Tests.csproj              |  1 +
 src/libawt/awt.c                                 |  0
 src/libawt/libawt.clangproj                      | 16 ++++++++++++++++
 5 files changed, 24 insertions(+)
 create mode 100644 src/libawt/awt.c
 create mode 100644 src/libawt/libawt.clangproj

diff --git a/IKVM.sln b/IKVM.sln
index 89e1a42eb7..ddaa6c0f6e 100644
--- a/IKVM.sln
+++ b/IKVM.sln
@@ -344,6 +344,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.runtime.win7-x64
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.runtime.win7-x86", "src\IKVM.Image.runtime.win7-x86\IKVM.Image.runtime.win7-x86.csproj", "{9932A047-DCBC-4649-8EA0-8F14996C8C28}"
 EndProject
+Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libawt", "src\libawt\libawt.clangproj", "{93B43F23-23B1-4968-951E-DC9A447D6F0E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -778,6 +780,10 @@ Global
 		{9932A047-DCBC-4649-8EA0-8F14996C8C28}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9932A047-DCBC-4649-8EA0-8F14996C8C28}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9932A047-DCBC-4649-8EA0-8F14996C8C28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93B43F23-23B1-4968-951E-DC9A447D6F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93B43F23-23B1-4968-951E-DC9A447D6F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93B43F23-23B1-4968-951E-DC9A447D6F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93B43F23-23B1-4968-951E-DC9A447D6F0E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/IKVM.Image-bin/IKVM.Image-bin.csproj b/src/IKVM.Image-bin/IKVM.Image-bin.csproj
index fc54fff1dd..365604db2b 100644
--- a/src/IKVM.Image-bin/IKVM.Image-bin.csproj
+++ b/src/IKVM.Image-bin/IKVM.Image-bin.csproj
@@ -15,6 +15,7 @@
         <_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libunpack\libunpack.clangproj" />
         <_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libsunec\libsunec.clangproj" />
         <_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libsunmscapi\libsunmscapi.clangproj" SupportedRuntimes="win7-x64;win7-x86;win10-arm64" />
+        <_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libawt\libawt.clangproj" />
     </ItemGroup>
 
     <Target Name="GetClangProjectReferencesByRuntime" Inputs="@(_ReferencedClangProjects)" Outputs="%(_ReferencedClangProjects.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
diff --git a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj
index f1755a1174..4d382c8996 100644
--- a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj
+++ b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj
@@ -2,6 +2,7 @@
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
         <PreserveCompilationContext>true</PreserveCompilationContext>
+        <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/libawt/awt.c b/src/libawt/awt.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/libawt/libawt.clangproj b/src/libawt/libawt.clangproj
new file mode 100644
index 0000000000..f3140e4309
--- /dev/null
+++ b/src/libawt/libawt.clangproj
@@ -0,0 +1,16 @@
+<Project>
+    <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.props" />
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>93b43f23-23b1-4968-951e-dc9a447d6f0e</ProjectGuid>
+    </PropertyGroup>
+    <PropertyGroup>
+        <TargetName>awt</TargetName>
+        <LanguageStandard>c99</LanguageStandard>
+    </PropertyGroup>
+    <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />
+    <ItemGroup>
+        <Compile Include="awt.c" />
+    </ItemGroup>
+</Project>
\ No newline at end of file