From ff9a7b748fa67498b54c6143d752d343e6cb5e7a Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 4 Jun 2024 16:59:18 -0500 Subject: [PATCH] Clena up temp output into separate dirs so we don't have one big thing to remove and dig through and clean. Move some more resource files out of build/ to generating: tzmappings, tzdb, flavormap, cursor resources, etc. --- openjdk.props | 1 - src/IKVM.Image/IKVM.Image.csproj | 76 +++++-- src/IKVM.Image/IKVM.Image.runtime.targets | 32 ++- src/IKVM.Java/IKVM.Java.runtime.props | 8 - src/IKVM.Java/IKVM.Java.runtime.targets | 266 +++++++++++++--------- src/dist-image/dist-image.csproj | 20 +- 6 files changed, 264 insertions(+), 139 deletions(-) diff --git a/openjdk.props b/openjdk.props index 03699e1e1..90d63b21d 100644 --- a/openjdk.props +++ b/openjdk.props @@ -388,7 +388,6 @@ - diff --git a/src/IKVM.Image/IKVM.Image.csproj b/src/IKVM.Image/IKVM.Image.csproj index 0b23b0dd8..9089f7ee0 100644 --- a/src/IKVM.Image/IKVM.Image.csproj +++ b/src/IKVM.Image/IKVM.Image.csproj @@ -32,18 +32,8 @@ - - - - - - - - - - - - + + @@ -52,15 +42,21 @@ - - - - - - - + + + + + + + + + + + + + $(OpenJdkDir)jdk\make\data\tzdata @@ -86,10 +82,50 @@ + + $(OpenJdkDir)jdk\src\share\classes\java\util\CurrencyData.properties + $(IntermediateOutputPath)currency.data + + + + + + + + + + + + + + + + + + + + + + + GenerateTZDB; - GenerateSecurityPolicy; + GenerateCurrencyData; + GenerateCaCerts; $(GenerateDependsOn); diff --git a/src/IKVM.Image/IKVM.Image.runtime.targets b/src/IKVM.Image/IKVM.Image.runtime.targets index b75f9f4a2..d10591737 100644 --- a/src/IKVM.Image/IKVM.Image.runtime.targets +++ b/src/IKVM.Image/IKVM.Image.runtime.targets @@ -27,6 +27,36 @@ + + windows + solaris + windows + linux + macosx + + + + + + + + + + motif + win32 + + + + + + + + + + + + + TargetFramework=net472 @@ -91,5 +121,5 @@ - + diff --git a/src/IKVM.Java/IKVM.Java.runtime.props b/src/IKVM.Java/IKVM.Java.runtime.props index 9e3960b97..2b464097f 100644 --- a/src/IKVM.Java/IKVM.Java.runtime.props +++ b/src/IKVM.Java/IKVM.Java.runtime.props @@ -19,14 +19,6 @@ macosx - - windows - solaris - windows - linux - macosx - - diff --git a/src/IKVM.Java/IKVM.Java.runtime.targets b/src/IKVM.Java/IKVM.Java.runtime.targets index 9c07c56a7..f5db068e2 100644 --- a/src/IKVM.Java/IKVM.Java.runtime.targets +++ b/src/IKVM.Java/IKVM.Java.runtime.targets @@ -122,8 +122,6 @@ - $(IntermediateOutputPath)gensrc\ - $(IntermediateOutputPath)genlib\ $(OpenJdkDir)jdk\make\scripts\ @@ -142,11 +140,9 @@ - - - + @@ -160,7 +156,7 @@ <_SpecialCasingArg>$(_SpecialCasingArg.Replace('\', '\\')) <_PropListArg>$(UnicodeDataDir)PropList.txt <_PropListArg>$(_PropListArg.Replace('\', '\\')) - <_OutputArg>$(GenSrc)java\lang\%(CharacterDataItem.Identity).java.tmp + <_OutputArg>$(IntermediateOutputPath)genchardat\java\lang\%(CharacterDataItem.Identity).java.tmp <_OutputArg>$(_OutputArg.Replace('\', '\\')) @@ -181,24 +177,32 @@ <_GenerateCharacterArgs Include="%(CharacterDataItem.Arg3)" /> - + - + - + + + - - + + + + + + + - - + + - + + @@ -210,12 +214,7 @@ - - - - - - + @@ -247,19 +246,25 @@ <_GenerateCharsetDecoderArgs Include="-DnotLegal="not legal for this charset"" /> <_GenerateCharsetDecoderArgs Include="-Dotypes-per-itype="chars-per-byte"" /> <_GenerateCharsetDecoderArgs Include="-DoutSequence="Unicode character"" /> + <_GenerateCharsetDecoderTmpl Include="$(OpenJdkDir)jdk\src\share\classes\java\nio\charset\Charset-X-Coder.java.template" /> + <_GenerateCharsetDecoderTemp Include="$(IntermediateOutputPath)genchardec\java\nio\charset\CharsetDecoder.java.tmp" /> + <_GenerateCharsetDecoderFile Include="$(IntermediateOutputPath)genchardec\java\nio\charset\CharsetDecoder.java" /> - - - - + + + + + - + + + - + @@ -290,15 +295,21 @@ <_GenerateCharsetEncoderArgs Include="-DnotLegal="not a legal sixteen-bit Unicode sequence"" /> <_GenerateCharsetEncoderArgs Include="-Dotypes-per-itype="bytes-per-char"" /> <_GenerateCharsetEncoderArgs Include="-DoutSequence="byte sequence in the given charset"" /> + <_GenerateCharsetEncoderTmpl Include="$(OpenJdkDir)jdk\src\share\classes\java\nio\charset\Charset-X-Coder.java.template" /> + <_GenerateCharsetEncoderTemp Include="$(IntermediateOutputPath)gencharenc\java\nio\charset\CharsetEncoder.java.tmp" /> + <_GenerateCharsetEncoderFile Include="$(IntermediateOutputPath)gencharenc\java\nio\charset\CharsetEncoder.java" /> - - - - + + + + + - + + + @@ -321,34 +332,40 @@ - - - - - - + + + + + + - + <_GenerateCharsetMappingArgs Include="%(GenerateCharsetMappingItem.Source)" /> - <_GenerateCharsetMappingArgs Include="%(GenerateCharsetMappingItem.Destination)" /> + <_GenerateCharsetMappingArgs Include="$(IntermediateOutputPath)gencharmap_%(GenerateCharsetMappingItem.Identity)\%(GenerateCharsetMappingItem.Destination)" /> <_GenerateCharsetMappingArgs Include="%(GenerateCharsetMappingItem.Identity)" /> <_GenerateCharsetMappingArgs Include="%(GenerateCharsetMappingItem.Copyright)" Condition=" '%(GenerateCharsetMappingItem.Copyright)' != '' " /> - + + + - + - - + <_GenerateCharsetMappingsItems Remove="@(_GenerateCharsetMappingsItems)" /> + <_GenerateCharsetMappingsItems Include="$(IntermediateOutputPath)gencharmap_%(GenerateCharsetMappingItem.Identity)\**\*" /> + + + + @@ -578,31 +595,40 @@ public class WriteStandardCharsets : Task - + + + + - + - - - - - - - - + + + + + + - - - - - - + + + + + + @@ -614,21 +640,27 @@ public class WriteStandardCharsets : Task - + <_DtdHome Include="$(OpenJdkDir)jdk\make\data\dtdbuilder" /> - <_BdtdTemp Include="$(GenSrc)javax\swing\text\html\parser\html32.bdtd.tmp" /> - <_Bdtd Include="$(GenSrc)javax\swing\text\html\parser\html32.bdtd" /> + <_BdtdTemp Include="$(IntermediateOutputPath)genhtml32dtd\javax\swing\text\html\parser\html32.bdtd.tmp" /> + <_Bdtd Include="$(IntermediateOutputPath)genhtml32dtd\javax\swing\text\html\parser\html32.bdtd" /> - + + + + + + + @@ -1018,12 +1050,12 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - + - + <_Src Remove="@(_Src)" /> @@ -1031,12 +1063,12 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN <_Bin Remove="@(_Bin)" /> <_Bin Include="$(OpenJdkDir)jdk\src\share\classes\java\nio\%(_GenBufferCommand.Template)-bin.java.template" /> <_Tmp Remove="@(_Tmp)" /> - <_Tmp Include="$(GenSrc)java\nio\%(_GenBufferCommand.Identity).java.tmp" /> + <_Tmp Include="$(IntermediateOutputPath)genbuf\java\nio\%(_GenBufferCommand.Identity).java.tmp" /> <_Dst Remove="@(_Dst)" /> - <_Dst Include="$(GenSrc)java\nio\%(_GenBufferCommand.Identity).java" /> + <_Dst Include="$(IntermediateOutputPath)genbuf\java\nio\%(_GenBufferCommand.Identity).java" /> - + @@ -1049,13 +1081,12 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - - + @@ -1066,7 +1097,7 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN $(GenerateSourceDependsOn); - + 21.0.1 @@ -1078,14 +1109,20 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - + - - - + + + + + + + + + @@ -1123,23 +1160,23 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - + - + <_Src Remove="@(_Src)" /> <_Src Include="%(AwtIcons.Identity)" /> <_Tmp Remove="@(_Tmp)" /> - <_Tmp Include="$(GenSrc)sun\awt\%(AwtIcons.ClassName).java.tmp" /> + <_Tmp Include="$(IntermediateOutputPath)genico\sun\awt\%(AwtIcons.ClassName).java.tmp" /> <_Dst Remove="@(_Dst)" /> - <_Dst Include="$(GenSrc)sun\awt\%(AwtIcons.ClassName).java" /> + <_Dst Include="$(IntermediateOutputPath)genico\sun\awt\%(AwtIcons.ClassName).java" /> - + @@ -1147,13 +1184,12 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - - + @@ -1165,25 +1201,26 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - $(GenSrc)javax\swing\plaf\nimbus\ $(OpenJdkDir)jdk\src\share\classes\javax\swing\plaf\nimbus $(OpenJdkDir)jdk\src\share\classes\javax\swing\plaf\nimbus\skin.laf - + - - - - + + + + - + + + @@ -1195,14 +1232,14 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - $(IntermediateOutputPath)x11wrappers\ - $(GenSrc)sun\awt\X11\ + $(IntermediateOutputPath)genx11_tmp\ + $(IntermediateOutputPath)genx11\sun\awt\X11\ $(OpenJdkDir)jdk\src\solaris\classes\sun\awt\X11\generator\xlibtypes.txt $(OpenJdkDir)jdk\src\solaris\classes\sun\awt\X11\generator\sizes.32 $(OpenJdkDir)jdk\src\solaris\classes\sun\awt\X11\generator\sizes.64 - + @@ -1225,12 +1262,13 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - + - - - + + + + @@ -1241,6 +1279,35 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN + + $(OpenJdkDir)jdk\make\data\unicodedata\UnicodeData.txt + $(IntermediateOutputPath)uniName.dat + + + + + + + + + + + + + + + + + + + + + + GenerateUniName; + $(GenerateSourceDependsOn); + + + $(GenerateSourceDependsOn); @@ -1248,12 +1315,7 @@ File.WriteAllLines(Path, File.ReadAllLines(Path).TakeWhile(i => i.Contains("#BIN - - - <_GenSrcJavaResource Include="$(GenSrc)**\*" Exclude="$(GenSrc)**\*.java;$(GenSrc)**\*.class" /> - - - + diff --git a/src/dist-image/dist-image.csproj b/src/dist-image/dist-image.csproj index 5d4a94d74..b01297d26 100644 --- a/src/dist-image/dist-image.csproj +++ b/src/dist-image/dist-image.csproj @@ -92,14 +92,20 @@ public class StripTargetPath : Task { var d = new Dictionary(); - foreach (var item in Items) + if (Items != null) { - var p = item.GetMetadata("TargetPath"); - var a = p.Split(Path.DirectorySeparatorChar).ToList(); - a.RemoveAt(1); - p = string.Join(Path.DirectorySeparatorChar.ToString(), a); - item.SetMetadata("TargetPath", p); - d[p] = item; + foreach (var item in Items) + { + var p = item.GetMetadata("TargetPath"); + if (string.IsNullOrEmpty(p) == false) + { + var a = p.Split(Path.DirectorySeparatorChar).ToList(); + a.RemoveAt(1); + p = string.Join(Path.DirectorySeparatorChar.ToString(), a); + item.SetMetadata("TargetPath", p); + d[p] = item; + } + } } Items = d.Values.ToArray();