| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1101,33 +1101,33 @@ protected boolean exportApplication(File destFolder, | |||
| 1101 | 1101 | ||
| 1102 | 1102 | /// figure out run options for the VM | |
| 1103 | 1103 | ||
| 1104 | - List<String> runOptions = new ArrayList<String>(); | ||
| 1104 | + StringList runOptions = new StringList(); | ||
| 1105 | 1105 | ||
| 1106 | 1106 | // Set memory options, except for ARM where we're more memory-constrained | |
| 1107 | 1107 | // compared to the machine being used to build/export the sketch | |
| 1108 | 1108 | // https://github.com/processing/processing/pull/4406 | |
| 1109 | 1109 | if (Preferences.getBoolean("run.options.memory") && | |
| 1110 | 1110 | !exportVariant.equals("armv6hf")) { | |
| 1111 | - runOptions.add("-Xms" + Preferences.get("run.options.memory.initial") + "m"); | ||
| 1112 | - runOptions.add("-Xmx" + Preferences.get("run.options.memory.maximum") + "m"); | ||
| 1111 | + runOptions.append("-Xms" + Preferences.get("run.options.memory.initial") + "m"); | ||
| 1112 | + runOptions.append("-Xmx" + Preferences.get("run.options.memory.maximum") + "m"); | ||
| 1113 | 1113 | } | |
| 1114 | 1114 | // https://github.com/processing/processing/issues/2239 | |
| 1115 | - runOptions.add("-Djna.nosys=true"); | ||
| 1115 | + runOptions.append("-Djna.nosys=true"); | ||
| 1116 | 1116 | // https://github.com/processing/processing/issues/4608 | |
| 1117 | 1117 | if (embedJava) { | |
| 1118 | 1118 | // if people don't embed Java, it might be a mess, but what can we do | |
| 1119 | 1119 | if (exportPlatform == PConstants.MACOSX) { | |
| 1120 | - runOptions.add("-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk" + PApplet.javaVersionName + ".jdk/Contents/Home/jre/lib/ext"); | ||
| 1120 | + runOptions.append("-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk" + PApplet.javaVersionName + ".jdk/Contents/Home/jre/lib/ext"); | ||
| 1121 | 1121 | } else if (exportPlatform == PConstants.WINDOWS) { | |
| 1122 | - runOptions.add("-Djava.ext.dirs=%EXEDIR%/java/lib/ext"); | ||
| 1122 | + runOptions.append("-Djava.ext.dirs=%EXEDIR%/java/lib/ext"); | ||
| 1123 | 1123 | } else if (exportPlatform == PConstants.LINUX) { | |
| 1124 | - runOptions.add("-Djava.ext.dirs=$APPDIR/java/lib/ext"); | ||
| 1124 | + runOptions.append("-Djava.ext.dirs=$APPDIR/java/lib/ext"); | ||
| 1125 | 1125 | } | |
| 1126 | 1126 | } | |
| 1127 | 1127 | ||
| 1128 | 1128 | // https://github.com/processing/processing/issues/2559 | |
| 1129 | 1129 | if (exportPlatform == PConstants.WINDOWS) { | |
| 1130 | - runOptions.add("-Djava.library.path=\"%EXEDIR%\\lib\""); | ||
| 1130 | + runOptions.append("-Djava.library.path=\"%EXEDIR%\\lib\""); | ||
| 1131 | 1131 | } | |
| 1132 | 1132 | ||
| 1133 | 1133 | ||
@@ -1286,8 +1286,7 @@ protected boolean exportApplication(File destFolder, | |||
| 1286 | 1286 | // https://github.com/processing/processing/issues/2349 | |
| 1287 | 1287 | pw.print("$APPDIR/java/bin/"); | |
| 1288 | 1288 | } | |
| 1289 | - String runOptionsStr = | ||
| 1290 | - PApplet.join(runOptions.toArray(new String[0]), " "); | ||
| 1289 | + String runOptionsStr = runOptions.join(" "); | ||
| 1291 | 1290 | pw.print("java " + runOptionsStr + | |
| 1292 | 1291 | " -Djava.library.path=\"$APPDIR:$APPDIR/lib\"" + | |
| 1293 | 1292 | " -cp \"" + exportClassPath + "\"" + | |
| Back | FazBrowse Home | New Git URL |
0 commit comments