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

more reworking of export, but ui still unfinished

Browse Source
This commit is contained in:
Ben Fry
2022-01-22 13:04:38 -05:00
parent 1a49263a94
commit 85e136f17f
3 changed files with 90 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/processing/app/Library.java
View File

@@ -428,6 +428,12 @@ public class Library extends LocalContribution {
}
public File[] getApplicationExports(String variant) {
String[] list = getApplicationExportList(variant);
return wrapFiles(list);
}
/*
public File[] getApplicationExports(int platform, String variant) {
String[] list = getApplicationExportList(platform, variant);

22
app/src/processing/app/Platform.java
View File

@@ -41,17 +41,19 @@ import processing.data.StringDict;
public class Platform {
static DefaultPlatform inst;
/*
static Map<Integer, String> platformNames = new HashMap<>();
static {
platformNames.put(PConstants.WINDOWS, "windows"); //$NON-NLS-1$
platformNames.put(PConstants.MACOS, "macosx"); //$NON-NLS-1$
platformNames.put(PConstants.MACOS, "macos"); //$NON-NLS-1$
platformNames.put(PConstants.LINUX, "linux"); //$NON-NLS-1$
}
*/
static Map<String, Integer> platformIndices = new HashMap<>();
static {
platformIndices.put("windows", PConstants.WINDOWS); //$NON-NLS-1$
platformIndices.put("macosx", PConstants.MACOS); //$NON-NLS-1$
platformIndices.put("macos", PConstants.MACOS); //$NON-NLS-1$
platformIndices.put("linux", PConstants.LINUX); //$NON-NLS-1$
}
@@ -263,12 +265,16 @@ public class Platform {
// static public String getName(int which) {
// return platformNames.get(which);
// }
//
//
// static public int getIndex(String what) {
// Integer entry = platformIndices.get(what);
// return (entry == null) ? -1 : entry;
// }
static public int getIndex(String platformName) {
// if this has os.arch at the end, remove it
int index = platformName.indexOf('-');
if (index != -1) {
platformName = platformName.substring(0, index);
}
return platformIndices.getOrDefault(platformName, -1);
}
// These were changed to no longer rely on PApplet and PConstants because

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

@@ -391,6 +391,7 @@ public class JavaBuild {
* for libraries that begin with a prefix like javax, since that includes
* the OpenGL library, even though we're just returning true here, hrm...
*/
@SuppressWarnings("RedundantIfStatement")
protected boolean ignorableImport(String pkg) {
if (pkg.startsWith("java.")) return true;
if (pkg.startsWith("javax.")) return true;
@@ -572,59 +573,78 @@ public class JavaBuild {
return false;
}
File folder = null;
for (String platformName : PConstants.platformNames) {
// int platform = Platform.getIndex(platformName);
/*
for (StringDict.Entry entry : Platform.getSupportedVariants().entries()) {
String variant = entry.key;
String name = entry.value;
}
*/
final String hostVariant = Platform.getVariant();
for (String variant : Preferences.get("export.variants").split(",")) {
// Can only embed Java on the native platform
boolean embedJava = (platform == PApplet.platform) &&
boolean embedJava = variant.equals(hostVariant) &&
Preferences.getBoolean("export.application.embed_java");
if (Preferences.getBoolean(JavaEditor.EXPORT_PREFIX + platformName)) {
final int bits = Platform.getNativeBits();
final String arch = Platform.getNativeArch();
if (Library.hasMultipleArch(platform, importedLibraries)) {
// removing 32-bit export for 4.0 alpha 3
/*
// Don't try to export 32-bit on macOS, because it doesn't exist.
if (platform != PConstants.MACOS) {
// export the 32-bit version
folder = new File(sketch.getFolder(), "application." + platformName + "32");
if (!exportApplication(folder, platform, "32", embedJava && (bits == 32) && ("x86".equals(arch) || "i386".equals(arch)))) {
return false;
}
}
*/
// export the 64-bit version
//folder = new File(sketch.getFolder(), "application." + platformName + "64");
// No longer including the 64 suffix in 4.0a3 because it's all 64-bit
folder = new File(sketch.getFolder(), "application." + platformName);
if (!exportApplication(folder, platform, "64", embedJava && (bits == 64) && "amd64".equals(arch))) {
return false;
}
/*
if (platform == PConstants.LINUX) {
// export the arm versions as well
folder = new File(sketch.getFolder(), "application.linux-armv6hf");
if (!exportApplication(folder, platform, "armv6hf", embedJava && (bits == 32) && "arm".equals(arch))) {
return false;
}
folder = new File(sketch.getFolder(), "application.linux-arm64");
if (!exportApplication(folder, platform, "arm64", embedJava && (bits == 64) && "aarch64".equals(arch))) {
return false;
}
}
*/
} else { // just make a single one for this platform
folder = new File(sketch.getFolder(), "application." + platformName);
if (!exportApplication(folder, platform, "", embedJava)) {
return false;
}
}
File folder = new File(sketch.getFolder(), variant);
if (!exportApplication(folder, variant, embedJava)) {
return false;
}
}
// File folder = null;
// for (String platformName : PConstants.platformNames) {
//// int platform = Platform.getIndex(platformName);
//
// // Can only embed Java on the native platform
// boolean embedJava = (platform == PApplet.platform) &&
// Preferences.getBoolean("export.application.embed_java");
//
// if (Preferences.getBoolean(JavaEditor.EXPORT_PREFIX + platformName)) {
// final int bits = Platform.getNativeBits();
// final String arch = Platform.getNativeArch();
//
// if (Library.hasMultipleArch(platform, importedLibraries)) {
// // removing 32-bit export for 4.0 alpha 3
// /*
// // Don't try to export 32-bit on macOS, because it doesn't exist.
// if (platform != PConstants.MACOS) {
// // export the 32-bit version
// folder = new File(sketch.getFolder(), "application." + platformName + "32");
// if (!exportApplication(folder, platform, "32", embedJava && (bits == 32) && ("x86".equals(arch) || "i386".equals(arch)))) {
// return false;
// }
// }
// */
// // export the 64-bit version
// //folder = new File(sketch.getFolder(), "application." + platformName + "64");
// // No longer including the 64 suffix in 4.0a3 because it's all 64-bit
// folder = new File(sketch.getFolder(), "application." + platformName);
// if (!exportApplication(folder, platform, "64", embedJava && (bits == 64) && "amd64".equals(arch))) {
// return false;
// }
// /*
// if (platform == PConstants.LINUX) {
// // export the arm versions as well
// folder = new File(sketch.getFolder(), "application.linux-armv6hf");
// if (!exportApplication(folder, platform, "armv6hf", embedJava && (bits == 32) && "arm".equals(arch))) {
// return false;
// }
// folder = new File(sketch.getFolder(), "application.linux-arm64");
// if (!exportApplication(folder, platform, "arm64", embedJava && (bits == 64) && "aarch64".equals(arch))) {
// return false;
// }
// }
// */
// } else { // just make a single one for this platform
// folder = new File(sketch.getFolder(), "application." + platformName);
// if (!exportApplication(folder, platform, "", embedJava)) {
// return false;
// }
// }
// }
// }
return true; // all good
}
@@ -646,8 +666,10 @@ public class JavaBuild {
}
}
/// prep the output directory
/// getting started
int exportPlatform = Platform.getIndex(exportVariant);
mode.prepareExportFolder(destFolder);
@@ -781,7 +803,7 @@ public class JavaBuild {
/// add contents of 'library' folders to the export
for (Library library : importedLibraries) {
// add each item from the library folder / export list to the output
for (File exportFile : library.getApplicationExports(exportPlatform, exportVariant)) {
for (File exportFile : library.getApplicationExports(exportVariant)) {
String exportName = exportFile.getName();
if (!exportFile.exists()) {
System.err.println(exportFile.getName() +