properly handle ARM for Export to Application on macOS

benfry · benfry · commit 4b6e675f40d6 · 2022-06-19T10:11:07.000-04:00
diff --git a/java/application/Info.plist.tmpl b/java/application/Info.plist.tmpl
@@ -45,7 +45,7 @@
 
     <key>LSArchitecturePriority</key>
     <array>
-      <string>x86_64</string>
+      <string>@@lsarchitecturepriority@@</string>
     </array>
 
     <key>LSEnvironment</key>
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -849,7 +849,7 @@ protected boolean exportApplication(File destFolder,
     // 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 @@ protected boolean exportApplication(File destFolder,
       }
     }
 
-    /// 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 @@ protected boolean exportApplication(File destFolder,
             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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ protected boolean exportApplication(File destFolder,`
`849`	`849`	`// compared to the machine being used to build/export the sketch`
`850`	`850`	`// https://github.com/processing/processing/pull/4406`
`851`	`851`	`if (Preferences.getBoolean("run.options.memory") &&`
`852`		`- !exportVariant.equals("arm")) {`
	`852`	`+ !exportVariant.contains("arm")) {`
`853`	`853`	`runOptions.append("-Xms" + Preferences.get("run.options.memory.initial") + "m");`
`854`	`854`	`runOptions.append("-Xmx" + Preferences.get("run.options.memory.maximum") + "m");`
`855`	`855`	`}`
`@@ -870,7 +870,8 @@ protected boolean exportApplication(File destFolder,`
`870`	`870`	`}`
`871`	`871`	`}`
`872`	`872`
`873`		`- /// macosx: write out Info.plist (template for classpath, etc)`
	`873`	`+`
	`874`	`+ /// macOS: write out Info.plist (template for classpath, etc)`
`874`	`875`
`875`	`876`	`if (exportPlatform == PConstants.MACOS) {`
`876`	`877`	`StringBuilder runOptionsXML = new StringBuilder();`
`@@ -911,6 +912,10 @@ protected boolean exportApplication(File destFolder,`
`911`	`912`	`sb.replace(index, index + "@@lsuipresentationmode@@".length(),`
`912`	`913`	`Preferences.getBoolean("export.application.present") ? "4" : "0");`
`913`	`914`	`}`
	`915`	`+ while ((index = sb.indexOf("@@lsarchitecturepriority@@")) != -1) {`
	`916`	`+ sb.replace(index, index + "@@lsarchitecturepriority@@".length(),`
	`917`	`+ exportVariant.substring("macos-".length()));`
	`918`	`+ }`
`914`	`919`
`915`	`920`	`lines[i] = sb.toString();`
`916`	`921`	`}`