eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor re-org while looking at Jython integration

Browse Source
This commit is contained in:
Ben Fry
2023-02-14 13:59:13 -05:00
parent 90adfbd546
commit b53a17c965
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/ExportPrompt.java
+9 -6
View File
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2012-22 The Processing Foundation
Copyright (c) 2012-23 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -28,6 +28,7 @@ import processing.app.Platform;
import processing.app.Preferences;
import processing.app.SketchException;
import processing.app.ui.ColorChooser;
import processing.app.ui.Editor;
import processing.core.PApplet;
import processing.data.StringDict;
import processing.data.StringList;
@@ -50,12 +51,14 @@ public class ExportPrompt {
"https://github.com/processing/processing4/wiki/Exporting-Applications#macos";
static final String EXPORT_VARIANTS = "export.application.variants";
static public final String JAVA_DOWNLOAD_URL = "https://adoptium.net/";
final JButton exportButton = new JButton(Language.text("prompt.export"));
final JButton cancelButton = new JButton(Language.text("prompt.cancel"));
List<JCheckBox> variantButtons;
final JavaEditor editor;
final Editor editor;
static ExportPrompt inst;
@@ -212,7 +215,7 @@ public class ExportPrompt {
final String warning2b =
"Users will need to ";
final String warning3 =
"<a href=\"" + JavaBuild.JAVA_DOWNLOAD_URL + "\">" +
"<a href=\"" + JAVA_DOWNLOAD_URL + "\">" +
"install OpenJDK " + PApplet.javaPlatform + "</a>.";
// both are needed because they change as the user hits the checkbox
@@ -222,7 +225,7 @@ public class ExportPrompt {
final JLabel warningLabel = new JLabel(embed ? embedWarning : nopeWarning);
warningLabel.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent event) {
Platform.openURL(JavaBuild.JAVA_DOWNLOAD_URL);
Platform.openURL(JAVA_DOWNLOAD_URL);
}
});
warningLabel.setBorder(new EmptyBorder(3, 13, 3, 13));
@@ -257,13 +260,13 @@ public class ExportPrompt {
signPanel.setBorder(new TitledBorder(Language.text("export.code_signing")));
String thePain =
"Applications on macOS must be \u201Csigned\u201D and \u201Cnotarized,\u201D " +
"Applications on macOS must be “signed” and “notarized,”" +
"or they will be reported as damaged or unsafe. ";
//if (false && new File("/usr/bin/codesign_allocate").exists()) {
if (JavaBuild.isXcodeInstalled()) {
thePain += "<br/>" +
"This application will be \u201Cself-signed\u201D which means that " +
"This application will be “self-signed” which means that " +
"macOS may complain that it comes from an unidentified developer. " +
"If the application will not run, try right-clicking the app and " +
"selecting Open from the pop-up menu. " +
java/src/processing/mode/java/JavaBuild.java
+1 -2
View File
@@ -48,7 +48,6 @@ public class JavaBuild {
static public final String PACKAGE_REGEX =
"(?:^|\\s|;)package\\s+(\\S+)\\;";
static public final String JAVA_DOWNLOAD_URL = "https://adoptium.net/";
static public final String MIN_JAVA_VERSION = "17";
protected Sketch sketch;
@@ -951,7 +950,7 @@ public class JavaBuild {
XML config = new XML("launch4jConfig");
config.addChild("headerType").setContent("gui");
config.addChild("dontWrapJar").setContent("true");
config.addChild("downloadUrl").setContent(JAVA_DOWNLOAD_URL);
config.addChild("downloadUrl").setContent(ExportPrompt.JAVA_DOWNLOAD_URL);
File exeFile = new File(destFolder, sketch.getName() + ".exe");
config.addChild("outfile").setContent(exeFile.getAbsolutePath());