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

cleaning up export, fix min Java in Windows, update download URL

Browse Source
This commit is contained in:
Ben Fry
2020-09-25 08:10:24 -04:00
parent 6bd321765d
commit 12f83dd021
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,12 @@ import processing.mode.java.preproc.PreprocessorResult;
public class JavaBuild {
public static final String PACKAGE_REGEX =
static public final String PACKAGE_REGEX =
"(?:^|\\s|;)package\\s+(\\S+)\\;";
static public final String JAVA_DOWNLOAD_URL = "https://adoptopenjdk.net/";
static public final String MIN_JAVA_VERSION = "11.0.8";
protected Sketch sketch;
protected Mode mode;
@@ -713,39 +716,22 @@ public class JavaBuild {
/// create the main .jar file
// HashMap<String,Object> zipFileContents = new HashMap<String,Object>();
FileOutputStream zipOutputFile =
new FileOutputStream(new File(jarFolder, sketch.getName() + ".jar"));
ZipOutputStream zos = new ZipOutputStream(zipOutputFile);
// ZipEntry entry;
// add the manifest file so that the .jar can be double clickable
// add the manifest file so that the .jar can be double-clickable
// (not likely to work anymore these days [fry 200925])
addManifest(zos);
// add the project's .class files to the jar
// (just grabs everything from the build directory,
// since there may be some inner classes)
// TODO this needs to be recursive (for packages)
// File classFiles[] = tempClassesFolder.listFiles(new FilenameFilter() {
// public boolean accept(File dir, String name) {
// return name.endsWith(".class");
// }
// });
// for (File file : classFiles) {
// entry = new ZipEntry(file.getName());
// zos.putNextEntry(entry);
// zos.write(Base.loadBytesRaw(file));
// zos.closeEntry();
// }
addClasses(zos, binFolder);
// add the data folder to the main jar file
// addDataFolder(zos);
// For 2.0a2, make the data folder a separate directory, rather than
// packaging potentially large files into the JAR. On OS X, we have to hide
// the folder inside the .app package, while Linux and Windows will have a
// 'data' folder next to 'lib'.
// For 2.0a2, make the data folder a separate directory,
// rather than packaging potentially large files into the JAR.
// On macOS, we have to hide the folder inside the .app package,
// while Linux and Windows will have a 'data' folder next to 'lib'.
if (sketch.hasDataFolder()) {
if (exportPlatform == PConstants.MACOS) {
Util.copyDir(sketch.getDataFolder(), new File(jarFolder, "data"));
@@ -766,8 +752,6 @@ public class JavaBuild {
String exportFilename = exportFile.getName();
Util.copyFile(exportFile, new File(jarFolder, exportFilename));
jarList.append(exportFilename);
} else {
// cp += codeList[i] + File.pathSeparator;
}
}
}
@@ -920,7 +904,7 @@ public class JavaBuild {
XML config = new XML("launch4jConfig");
config.addChild("headerType").setContent("gui");
config.addChild("dontWrapJar").setContent("true");
config.addChild("downloadUrl").setContent("http://java.com/download");
config.addChild("downloadUrl").setContent(JAVA_DOWNLOAD_URL);
File exeFile = new File(destFolder, sketch.getName() + ".exe");
config.addChild("outfile").setContent(exeFile.getAbsolutePath());
@@ -937,9 +921,7 @@ public class JavaBuild {
if (embedJava) {
jre.addChild("path").setContent("java");
}
// Need u74 for a major JavaFX issue (upside-down display)
// https://github.com/processing/processing/issues/3795
jre.addChild("minVersion").setContent("1.8.0_74");
jre.addChild("minVersion").setContent(MIN_JAVA_VERSION);
for (String opt : runOptions) {
jre.addChild("opt").setContent(opt);
}

10
java/src/processing/mode/java/JavaEditor.java
View File

@@ -833,7 +833,6 @@ public class JavaEditor extends Editor {
final boolean embed =
Preferences.getBoolean("export.application.embed_java");
final String JDK_DOWNLOAD = "https://adoptopenjdk.net/";
final String warning1 =
"<html><div width=\"" + divWidth + "\"><font size=\"2\">";
final String warning2a =
@@ -843,16 +842,17 @@ public class JavaEditor extends Editor {
final String warning2b =
"Users will need to ";
final String warning3 =
"<a href=\"" + JDK_DOWNLOAD + "\">install OpenJDK " +
PApplet.javaPlatform + "</a>.";
// "<br/>&nbsp;";
"<a href=\"" + JavaBuild.JAVA_DOWNLOAD_URL + "\">" +
"install OpenJDK " + PApplet.javaPlatform + "</a>."; //"<br/>&nbsp;";
// both are needed because they change as the user hits the checkbox
final String embedWarning = warning1 + warning2a + warning3;
final String nopeWarning = warning1 + warning2b + warning3;
final JLabel warningLabel = new JLabel(embed ? embedWarning : nopeWarning);
warningLabel.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent event) {
Platform.openURL(JDK_DOWNLOAD);
Platform.openURL(JavaBuild.JAVA_DOWNLOAD_URL);
}
});
warningLabel.setBorder(new EmptyBorder(3, 13 + indent, 3, 13));