Merge pull request #555 from ikvmnet/nashorngen

Generate Nashorn code from source
ikvmnet · Jul 15, 2024 · 3e6c88e · 3e6c88e
2 parents 228b694 + a2994d4
commit 3e6c88e
Show file tree

Hide file tree

Showing 18 changed files with 1,339 additions and 547 deletions.
diff --git a/IKVM.deps.targets b/IKVM.deps.targets
@@ -12,7 +12,7 @@
                 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
                 <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
                 <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-                <PackageReference Include="System.Text.Json" Version="8.0.0" />
+                <PackageReference Include="System.Text.Json" Version="8.0.4" />
             </ItemGroup>
         </When>
         <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

diff --git a/src/IKVM.Image/IKVM.Image.csproj b/src/IKVM.Image/IKVM.Image.csproj
@@ -67,13 +67,13 @@
         <TzFile Include="africa;antarctica;asia;australasia;europe;northamerica;southamerica;backward;etcetera;gmt;jdk11_backward" />
     </ItemGroup>
 
-    <Target Name="GenerateTZDB" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(OpenJdkBuildToolsStampFile);@(TzFile->'$(TzDataDir)\%(Identity)')" Outputs="$(TzDbDat)">
+    <Target Name="GenerateTZDB" DependsOnTargets="BuildJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(JdkBuildToolsStampFile);@(TzFile->'$(TzDataDir)\%(Identity)')" Outputs="$(TzDbDat)">
         <Error Text="Could not locate java executable." Condition=" '$(JavaPath)' == '' " />
         <Error Text="java could not be located at '$(JavaPath)'." Condition="!Exists('$(JavaPath)')" />
         <Exec Command="chmod +x $(JavaPath) &gt;/dev/null 2&gt;&amp;1" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardErrorImportance="low" ContinueOnError="true" Condition="$([MSBuild]::IsOSUnixLike())" />
 
         <Delete Files="$(TzDbDat)" />
-        <Exec Command="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.tzdb.TzdbZoneRulesCompiler -srcdir $(TzDataDir) -dstfile $(TzDbDat) @(TzFile, ' ')" />
+        <Exec Command="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.tzdb.TzdbZoneRulesCompiler -srcdir $(TzDataDir) -dstfile $(TzDbDat) @(TzFile, ' ')" />
         <Touch Files="$(TzDbDat)" ForceTouch="true" AlwaysCreate="true" />
 
         <ItemGroup>
@@ -87,13 +87,13 @@
         <CurrencyDataDst>$(IntermediateOutputPath)currency.data</CurrencyDataDst>
     </PropertyGroup>
 
-    <Target Name="GenerateCurrencyData" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(OpenJdkBuildToolsStampFile);$(CurrencyDataSrc)" Outputs="$(CurrencyDataDst)">
+    <Target Name="GenerateCurrencyData" DependsOnTargets="BuildJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(JdkBuildToolsStampFile);$(CurrencyDataSrc)" Outputs="$(CurrencyDataDst)">
         <Error Text="Could not locate java executable." Condition=" '$(JavaPath)' == '' " />
         <Error Text="java could not be located at '$(JavaPath)'." Condition="!Exists('$(JavaPath)')" />
         <Exec Command="chmod +x $(JavaPath) &gt;/dev/null 2&gt;&amp;1" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardErrorImportance="low" ContinueOnError="true" Condition="$([MSBuild]::IsOSUnixLike())" />
 
         <Delete Files="$(CurrencyDataDst).tmp" />
-        <Exec Command="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.generatecurrencydata.GenerateCurrencyData -o $(CurrencyDataDst).tmp &lt; $(CurrencyDataSrc)" />
+        <Exec Command="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.generatecurrencydata.GenerateCurrencyData -o $(CurrencyDataDst).tmp &lt; $(CurrencyDataSrc)" />
         <Move SourceFiles="$(CurrencyDataDst).tmp" DestinationFiles="$(CurrencyDataDst)" />
         <Touch Files="$(CurrencyDataDst)" ForceTouch="true" AlwaysCreate="true" />
 
@@ -112,13 +112,13 @@
         <CacertDst>$(IntermediateOutputPath)cacerts</CacertDst>
     </PropertyGroup>
 
-    <Target Name="GenerateCacerts" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(OpenJdkBuildToolsStampFile);@(CacertSrc)" Outputs="$(CacertDst)">
+    <Target Name="GenerateCacerts" DependsOnTargets="BuildJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(JdkBuildToolsStampFile);@(CacertSrc)" Outputs="$(CacertDst)">
         <Error Text="Could not locate java executable." Condition=" '$(JavaPath)' == '' " />
         <Error Text="java could not be located at '$(JavaPath)'." Condition="!Exists('$(JavaPath)')" />
         <Exec Command="chmod +x $(JavaPath) &gt;/dev/null 2&gt;&amp;1" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardErrorImportance="low" ContinueOnError="true" Condition="$([MSBuild]::IsOSUnixLike())" />
 
         <Delete Files="$(CacertDst).tmp" />
-        <Exec Command="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.generatecacerts.GenerateCacerts $(OpenJdkDir)jdk/make/data/cacerts/ $(CacertDst).tmp" />
+        <Exec Command="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.generatecacerts.GenerateCacerts $(OpenJdkDir)jdk/make/data/cacerts/ $(CacertDst).tmp" />
         <Move SourceFiles="$(CacertDst).tmp" DestinationFiles="$(CacertDst)" />
         <Touch Files="$(CacertDst)" ForceTouch="true" AlwaysCreate="true" />
 

diff --git a/src/IKVM.Image/IKVM.Image.runtime.targets b/src/IKVM.Image/IKVM.Image.runtime.targets
@@ -100,13 +100,13 @@
         <FontConfigDst>$(IntermediateOutputPath)fontconfig.bfc</FontConfigDst>
     </PropertyGroup>
 
-    <Target Name="GenerateFontConfig" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(FontConfigSrc)" Outputs="$(FontConfigDst);$(IntermediateOutputPath)fontconfig.properties.src" Condition="Exists('$(FontConfigSrc)')">
+    <Target Name="GenerateFontConfig" DependsOnTargets="BuildJdkBuildTools;ResolveJava" Inputs="$(FontConfigSrc)" Outputs="$(FontConfigDst);$(IntermediateOutputPath)fontconfig.properties.src" Condition="Exists('$(FontConfigSrc)')">
         <Error Text="Could not locate java executable." Condition=" '$(JavaPath)' == '' " />
         <Error Text="java could not be located at '$(JavaPath)'." Condition="!Exists('$(JavaPath)')" />
         <Exec Command="chmod +x $(JavaPath) &gt;/dev/null 2&gt;&amp;1" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardErrorImportance="low" ContinueOnError="true" Condition="$([MSBuild]::IsOSUnixLike())" />
 
-        <Message Text="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.compilefontconfig.CompileFontConfig $(FontConfigSrc) $(FontConfigDst)" />
-        <Exec Command="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.compilefontconfig.CompileFontConfig $(FontConfigSrc) $(FontConfigDst)" />
+        <Message Text="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.compilefontconfig.CompileFontConfig $(FontConfigSrc) $(FontConfigDst)" />
+        <Exec Command="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.compilefontconfig.CompileFontConfig $(FontConfigSrc) $(FontConfigDst)" />
         <Copy SourceFiles="$(FontConfigSrc)" DestinationFiles="$(IntermediateOutputPath)fontconfig.properties.src" OverwriteReadOnlyFiles="true" />
 
         <ItemGroup>
@@ -129,13 +129,13 @@
         <JavaSecurityFileDst>$(IntermediateOutputPath)java.security</JavaSecurityFileDst>
     </PropertyGroup>
 
-    <Target Name="GenerateJavaSecurity" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(JavaSecurityFileSrc)" Outputs="$(JavaSecurityFileDst)">
+    <Target Name="GenerateJavaSecurity" DependsOnTargets="BuildJdkBuildTools;ResolveJava" Inputs="$(JavaSecurityFileSrc)" Outputs="$(JavaSecurityFileDst)">
         <Error Text="Could not locate java executable." Condition=" '$(JavaPath)' == '' " />
         <Error Text="java could not be located at '$(JavaPath)'." Condition="!Exists('$(JavaPath)')" />
         <Exec Command="chmod +x $(JavaPath) &gt;/dev/null 2&gt;&amp;1" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardErrorImportance="low" ContinueOnError="true" Condition="$([MSBuild]::IsOSUnixLike())" />
 
-        <Message Text="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.customizesecurityfile.CryptoLevel $(JavaSecurityFileSrc) $(JavaSecurityFileDst) unlimited" />
-        <Exec Command="$(JavaExec) -cp $(OpenJdkBuildToolsOutputPath) build.tools.customizesecurityfile.CryptoLevel $(JavaSecurityFileSrc) $(JavaSecurityFileDst) unlimited" />
+        <Message Text="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.customizesecurityfile.CryptoLevel $(JavaSecurityFileSrc) $(JavaSecurityFileDst) unlimited" />
+        <Exec Command="$(JavaExec) -cp $(JdkBuildToolsOutputPath) build.tools.customizesecurityfile.CryptoLevel $(JavaSecurityFileSrc) $(JavaSecurityFileDst) unlimited" />
 
         <ItemGroup>
             <IkvmImageItem Include="$(JavaSecurityFileDst)" ImagePath="lib\security\java.security" TargetFramework="any" RuntimeIdentifier="$(ImageRuntimeIdentifier)" />

diff --git a/src/IKVM.Java.runtime.linux/msbuild.binlog b/src/IKVM.Java.runtime.linux/msbuild.binlog