eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-28 02:41:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

rewrite Info.plist.tmpl subst, also specify JVM version

Browse Source
This commit is contained in:
Ben Fry
2022-06-19 13:15:34 -04:00
parent b939152b09
commit a366d9787c
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/application/Info.plist.tmpl
View File

@@ -37,6 +37,9 @@
<key>JVMMainClassName</key>
<string>@@sketch@@</string>
<key>JVMVersion</key>
<string>@@jdk_version@@</string>
<key>LSMinimumSystemVersion</key>
<string>10.14.6</string>

57
java/src/processing/mode/java/JavaBuild.java
View File

@@ -882,46 +882,28 @@ public class JavaBuild {
runOptionsXML.append('\n');
}
// read the template, first checking whether the sketch has its own copy
String PLIST_TEMPLATE = "Info.plist.tmpl";
File plistTemplate = new File(sketch.getFolder(), PLIST_TEMPLATE);
if (!plistTemplate.exists()) {
plistTemplate = mode.getContentFile("application/" + PLIST_TEMPLATE);
}
// substitute variables from the template with their values
StringBuilder sb = new StringBuilder(Util.loadFile(plistTemplate));
replaceTags(sb, "jvm_runtime", jvmRuntime);
replaceTags(sb, "jvm_version", MIN_JAVA_VERSION);
replaceTags(sb, "jvm_options_list", runOptionsXML.toString());
replaceTags(sb, "sketch", sketch.getMainName());
replaceTags(sb, "lsuipresentationmode",
Preferences.getBoolean("export.application.present") ? "4" : "0");
replaceTags(sb, "lsarchitecturepriority",
exportVariant.substring("macos-".length()));
// write the plist file
File plistFile = new File(dotAppFolder, "Contents/Info.plist");
PrintWriter pw = PApplet.createWriter(plistFile);
String[] lines = PApplet.loadStrings(plistTemplate);
for (int i = 0; i < lines.length; i++) {
if (lines[i].contains("@@")) {
StringBuilder sb = new StringBuilder(lines[i]);
int index = 0;
while ((index = sb.indexOf("@@jvm_runtime@@")) != -1) {
sb.replace(index, index + "@@jvm_runtime@@".length(),
jvmRuntime);
}
while ((index = sb.indexOf("@@jvm_options_list@@")) != -1) {
sb.replace(index, index + "@@jvm_options_list@@".length(),
runOptionsXML.toString());
}
while ((index = sb.indexOf("@@sketch@@")) != -1) {
sb.replace(index, index + "@@sketch@@".length(),
sketch.getMainName());
}
while ((index = sb.indexOf("@@lsuipresentationmode@@")) != -1) {
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();
}
// explicit newlines to avoid Windows CRLF
pw.print(lines[i] + "\n");
}
pw.print(sb);
pw.flush();
pw.close();
@@ -1055,6 +1037,15 @@ public class JavaBuild {
}
private void replaceTags(StringBuilder sb, String replacing, String replacement) {
int index = 0;
String tag = "@@" + replacing + "@@";
while ((index = sb.indexOf(tag)) != -1) {
sb.replace(index, index + tag.length(), replacement);
}
}
// This is a workaround until a more complete solution is found.
public Library findJavaFX() {
for (Library library : getImportedLibraries()) {