From da285c30c8cf3ef875e20cc45c79467fdad3f5c4 Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Sat, 13 Jul 2013 00:04:15 -0400
Subject: [PATCH] deal with Contents/Java/Classes issue

---
 app/src/processing/mode/java/Compiler.java  | 2 +-
 app/src/processing/mode/java/JavaBuild.java | 6 ++++++
 build/build-7u40.xml                        | 4 ++++
 todo.txt                                    | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/processing/mode/java/Compiler.java b/app/src/processing/mode/java/Compiler.java
index ba98e68fe..417e9f45f 100644
--- a/app/src/processing/mode/java/Compiler.java
+++ b/app/src/processing/mode/java/Compiler.java
@@ -100,7 +100,7 @@ public class Compiler {
 //    System.arraycopy(sourceFiles, 0, command, baseCommand.length, sourceCount);
     String[] command = PApplet.concat(baseCommand, sourceFiles);
 
-    //PApplet.println(command);
+//    PApplet.println(command);
 
     try {
       // Load errors into a local StringBuffer
diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
index 61c1894c9..43112e227 100644
--- a/app/src/processing/mode/java/JavaBuild.java
+++ b/app/src/processing/mode/java/JavaBuild.java
@@ -454,6 +454,12 @@ public class JavaBuild {
       javaClassPath = javaClassPath.substring(1, javaClassPath.length() - 1);
     }
     classPath += File.pathSeparator + javaClassPath;
+    
+    // But make sure that there isn't anything in there that's missing, 
+    // otherwise ECJ will complain and die. For instance, Java 1.7 (or maybe
+    // it's appbundler?) adds Java/Classes to the path, which kills us.
+    //String[] classPieces = PApplet.split(classPath, File.pathSeparator);
+    // Nah, nevermind... we'll just create the @!#$! folder until they fix it.
 
 
     // 3. then loop over the code[] and save each .java file
diff --git a/build/build-7u40.xml b/build/build-7u40.xml
index 58b5a7c0d..1c3c0e754 100755
--- a/build/build-7u40.xml
+++ b/build/build-7u40.xml
@@ -488,6 +488,10 @@
       <option value="-Xmx256M" />
     </bundleapp>
 
+    <!-- Work around auto-included folder (from appbundler? or Oracle Java?) 
+         that causes the p5 Compiler to crash if it doesn't exist. -->
+    <mkdir dir="macosx/work/Processing.app/Contents/Java/Classes" />
+
     <copy todir="macosx/work/Processing.app/Contents/Java">
       <fileset dir=".." includes="core/library/**" />
       <fileset dir="shared" includes="launch4j/**" />
diff --git a/todo.txt b/todo.txt
index 7b63b586c..35433ee8e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -803,6 +803,9 @@ _   7u40 target release is "late August"
 _     http://openjdk.java.net/projects/jdk7u/releases/7u40.html
 _   but default menu bar is still broken
 _     http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8007267
+_   Contents/Java/Classes folder is added to java.class.path
+_     so the folder must exist otherwise the ECJ compiler will crash
+_     once fixed, remove notes from JavaBuild.java
 _ blank sketch opened even if another opened by double-click
 _   add a 150 ms or more lag before opening the untitled window (on os x)
 _   https://github.com/processing/processing/issues/218