Optimize handling.

ikvmnet · Dec 5, 2024 · 7cb043a · 7cb043a
1 parent c8710f5
commit 7cb043a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/src/IKVM.MSBuild.Tasks/IkvmCompiler.cs b/src/IKVM.MSBuild.Tasks/IkvmCompiler.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -305,6 +304,7 @@ protected override async Task<bool> ExecuteAsync(IkvmToolTaskDiagnosticWriter wr
             options.NoAutoSerialization = NoAutoSerialization;
             options.NoGlobbing = NoGlobbing;
             options.NoJNI = NoJNI;
+            options.Optimize = Optimize;
             options.OptFields = OptFields;
             options.RemoveAssertions = RemoveAssertions;
             options.StrictFinalFieldSemantics = StrictFinalFieldSemantics;

diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets
@@ -283,6 +283,7 @@ Value = b.ToString();
             <_IkvmCompilerArgs Include="-keyfile &quot;$(KeyOriginatorFile)&quot;" Condition=" '$(KeyOriginatorFile)' != '' " />
             <_IkvmCompilerArgs Include="@(MapFile->'-remap &quot;%(FullPath)&quot;')" Condition=" '@(MapFile)' != '' " />
             <_IkvmCompilerArgs Include="-compressresources" Condition=" '$(CompressResources)' == 'true' " />
+            <_IkvmCompilerArgs Include="-optimize" Condition=" '$(Optimize)' == 'true' " />
             <_IkvmCompilerArgs Include="-opt:fields" />
             <_IkvmCompilerArgs Include="-strictfinalfieldsemantics" Condition=" '$(StrictFinalFieldSemantics)' == 'true' " />
             <_IkvmCompilerArgs Include="-removeassertions" Condition=" '$(RemoveAssertions)' == 'true' " />

diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.Tasks.targets
@@ -154,6 +154,7 @@
             WarningLevel="$(WarningLevel)"
             References="@(_IkvmCompilerReferencePath)"
             StrictFinalFieldSemantics="$(StrictFinalFieldSemantics)"
+            Optimize="$(Optimize)"
             OptFields="true"
             RemoveAssertions="$(RemoveAssertions)"
             Resources="@(_IkvmCompilerResource)"

diff --git a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs
@@ -153,6 +153,9 @@ public async Task<int> ExecuteAsync(IkvmImporterOptions options, CancellationTok
             if (options.NoJNI)
                 w.WriteLine("-nojni");
 
+            if (options.Optimize)
+                w.WriteLine("-optimize");
+
             if (options.OptFields)
                 w.WriteLine("-opt:fields");
 

diff --git a/src/IKVM.Tools.Runner/Importer/IkvmImporterOptions.cs b/src/IKVM.Tools.Runner/Importer/IkvmImporterOptions.cs
@@ -111,6 +111,8 @@ public class IkvmImporterOptions
 
         public bool NoJNI { get; set; }
 
+        public bool Optimize { get; set; }
+
         public bool OptFields { get; set; }
 
         public bool RemoveAssertions { get; set; }