avoid attempts to export 32-bit verrsions of apps on macOS (fixes #4971) · unexCoder/processing@15d0b85 · GitHub

1. unexCoder
2. processing

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 15d0b85

Browse filesBrowse the repository at this point in the historyBrowse files

benfry

committed

avoid attempts to export 32-bit verrsions of apps on macOS (fixes processing#4971)

1 parent 03cb1da commit 15d0b85
Copy full SHA for 15d0b85

2 files changed

+10-6Lines changed: 10 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• java/src/processing/mode/java
  • JavaBuild.java
• todo.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎java/src/processing/mode/java/JavaBuild.java‎

Copy file name to clipboardExpand all lines: java/src/processing/mode/java/JavaBuild.java

+8-6Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -381,7 +381,7 @@ public String preprocess(File srcFolder,
381	381
382	382	// grab the imports from the code just preprocessed
383	383
384		- importedLibraries = new ArrayList<Library>();
	384	+ importedLibraries = new ArrayList<>();
385	385	Library core = mode.getCoreLibrary();
386	386	if (core != null) {
387	387	importedLibraries.add(core);
@@ -697,11 +697,13 @@ protected boolean exportApplication() throws IOException, SketchException {
697	697	final String arch = Platform.getNativeArch();
698	698
699	699	if (Library.hasMultipleArch(platform, importedLibraries)) {
700		- // export the 32-bit version
701		- folder = new File(sketch.getFolder(), "application." + platformName + "32");
702		-
703		- if (!exportApplication(folder, platform, "32", embedJava && (bits == 32) && ("x86".equals(arch) || "i386".equals(arch)))) {
704		- return false;
	700	+ // Don't try to export 32-bit on macOS, because it doesn't exist.
	701	+ if (platform != PConstants.MACOSX) {
	702	+ // export the 32-bit version
	703	+ folder = new File(sketch.getFolder(), "application." + platformName + "32");
	704	+ if (!exportApplication(folder, platform, "32", embedJava && (bits == 32) && ("x86".equals(arch) || "i386".equals(arch)))) {
	705	+ return false;
	706	+ }
705	707	}
706	708	// export the 64-bit version
707	709	folder = new File(sketch.getFolder(), "application." + platformName + "64");

Collapse file

‎todo.txt‎

Copy file name to clipboardExpand all lines: todo.txt

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -18,6 +18,8 @@ X examples window
18	18	X sketchbook window
19	19	X https://github.com/processing/processing/issues/4936
20	20	X https://github.com/processing/processing/issues/5007
	21	+ X get rid of error message when exporting sketches with the video library
	22	+ X https://github.com/processing/processing/issues/4971
21	23
22	24	_ mode list does not update after changing sketchbook folder
23	25	_ already reported?

0 commit comments

Comments

0 (0)