diff --git a/java/application/Info.plist.tmpl b/java/application/Info.plist.tmpl index 5c8c8488f..f63884a9e 100644 --- a/java/application/Info.plist.tmpl +++ b/java/application/Info.plist.tmpl @@ -45,7 +45,7 @@ LSArchitecturePriority - x86_64 + @@lsarchitecturepriority@@ LSEnvironment diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index 3feed8214..cd506fcc7 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/java/src/processing/mode/java/JavaBuild.java @@ -849,7 +849,7 @@ public class JavaBuild { // compared to the machine being used to build/export the sketch // https://github.com/processing/processing/pull/4406 if (Preferences.getBoolean("run.options.memory") && - !exportVariant.equals("arm")) { + !exportVariant.contains("arm")) { runOptions.append("-Xms" + Preferences.get("run.options.memory.initial") + "m"); runOptions.append("-Xmx" + Preferences.get("run.options.memory.maximum") + "m"); } @@ -870,7 +870,8 @@ public class JavaBuild { } } - /// macosx: write out Info.plist (template for classpath, etc) + + /// macOS: write out Info.plist (template for classpath, etc) if (exportPlatform == PConstants.MACOS) { StringBuilder runOptionsXML = new StringBuilder(); @@ -911,6 +912,10 @@ public class JavaBuild { sb.replace(index, index + "@@lsuipresentationmode@@".length(), Preferences.getBoolean("export.application.present") ? "4" : "0"); } + while ((index = sb.indexOf("@@lsarchitecturepriority@@")) != -1) { + sb.replace(index, index + "@@lsarchitecturepriority@@".length(), + exportVariant.substring("macos-".length())); + } lines[i] = sb.toString(); } diff --git a/todo.txt b/todo.txt index c25af65dc..e904574ee 100755 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,7 @@ 1284 (4.0b9) X bump to Java 17.0.3+7 +X fix Export to Application on macOS with Apple Silicon +X gets rid of "Unable to start Java Runtime" contrib X add flatlaf.jar to the Windows config.xml