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

benfry · benfry · commit 15d0b85e5625 · 2017-04-23T09:22:31.000-04:00
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -381,7 +381,7 @@ public String preprocess(File srcFolder,
 
     // grab the imports from the code just preprocessed
 
-    importedLibraries = new ArrayList<Library>();
+    importedLibraries = new ArrayList<>();
     Library core = mode.getCoreLibrary();
     if (core != null) {
       importedLibraries.add(core);
@@ -697,11 +697,13 @@ protected boolean exportApplication() throws IOException, SketchException {
         final String arch = Platform.getNativeArch();
 
         if (Library.hasMultipleArch(platform, importedLibraries)) {
-          // 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;
+          // Don't try to export 32-bit on macOS, because it doesn't exist.
+          if (platform != PConstants.MACOSX) {
+            // 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");
diff --git a/todo.txt b/todo.txt
@@ -18,6 +18,8 @@ X   examples window
 X   sketchbook window
 X   https://github.com/processing/processing/issues/4936
 X   https://github.com/processing/processing/issues/5007
+X get rid of error message when exporting sketches with the video library
+X   https://github.com/processing/processing/issues/4971
 
 _ mode list does not update after changing sketchbook folder
 _   already reported?
