From a32a634b722932e89b0e35ca96167d654766a1f5 Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Wed, 21 Jan 2015 19:43:02 -0500
Subject: [PATCH] deal with .class signing conflicts and use JDT .jar files for
 compilation

---
 build/build.xml                         | 21 +++++++++++++++++----
 build/shared/tools/MovieMaker/build.xml |  3 ++-
 core/todo.txt                           |  5 ++++-
 java/libraries/dxf/build.xml            |  3 ++-
 java/libraries/glw/build.xml            |  3 ++-
 java/libraries/net/build.xml            |  3 ++-
 java/libraries/pdf/build.xml            |  3 ++-
 java/libraries/serial/build.xml         |  3 ++-
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index bccb96f4d..0313b3476 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -38,10 +38,10 @@
   <property name="jdk.update" value="72" />
   <property name="jdk.build" value="14" />
   -->
-  <!-- Switching to 8 because updates end April 2015 -->
+  <!-- Switching to 8 because updates for 7 end April 2015 -->
   <property name="jdk.version" value="8" />
-  <property name="jdk.update" value="25" />
-  <property name="jdk.build" value="17" />
+  <property name="jdk.update" value="31" />
+  <property name="jdk.build" value="13" />
   <property name="jdk.stuff" value="${jdk.version}u${jdk.update}" />
   <property name="jdk.esoteric" value="1.${jdk.version}.0_${jdk.update}" />
 
@@ -54,10 +54,23 @@
              value="jre-${jdk.stuff}-${platform}-x64.tar.gz"> 
     <equals arg1="${sun.arch.data.model}" arg2="64" />
   </condition>
+
+  <!-- for the new one that uses the special getter -->
+  <condition property="jre.download" 
+             value="${jdk.stuff}-${platform}-i586.tar.gz"> 
+    <equals arg1="${sun.arch.data.model}" arg2="32" />
+  </condition>
+  <condition property="jre.download" 
+             value="${jdk.stuff}-${platform}-x64.tar.gz"> 
+    <equals arg1="${sun.arch.data.model}" arg2="64" />
+  </condition>
+
   <!-- JDK location for Mac OS X -->
+  <!--
   <condition property="jdk.file" value="jdk-${jdk.stuff}-macosx-x64.dmg">
     <equals arg1="${platform}" arg2="macosx" />
   </condition>
+  -->
 
   <fileset dir="windows/work/java" id="jre-optional-windows">
     <include name="lib/ext/dnsns.jar" />
@@ -183,7 +196,7 @@
   <available file="${jdk.path.macosx}" property="macosx_jdk_found" />
 
   <fail if="macosx" unless="macosx_jdk_found"
-        message="JDK ${jdk.stuff} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.stuff} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}or http://download.processing.org/java/${jdk.file}${line.separator}Note that only ${jdk.stuff} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
+        message="JDK ${jdk.stuff} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.stuff} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.stuff} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
   <!--
   <fail if="linux" unless="java_tools_found" 
         message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
diff --git a/build/shared/tools/MovieMaker/build.xml b/build/shared/tools/MovieMaker/build.xml
index 7261ece3a..416992a8c 100644
--- a/build/shared/tools/MovieMaker/build.xml
+++ b/build/shared/tools/MovieMaker/build.xml
@@ -17,7 +17,8 @@
 	   classpath="../../../../app/bin" 
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../../../java/mode/ecj.jar" />
+      <compilerclasspath path="../../../../java/mode/org.eclipse.jdt.core.jar; 
+                               ../../../../java/mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
 
diff --git a/core/todo.txt b/core/todo.txt
index db06b4ed2..46dcbc633 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,4 +1,4 @@
-s0233 (3.0a6)
+0233 (3.0a6)
 X remove Applet as base class
 X how to name the retina pixel stuff
 X   hint(ENABLE_RETINA_PIXELS) or hint(ENABLE_HIDPI_PIXELS)
@@ -6,6 +6,9 @@ X   hint(ENABLE_2X_PIXELS)?
 X   hidpi is Apple's name as well
 X   mostly getting away from this
 
+_ textAlign(RIGHT) including spaces at the end of each line
+_   https://github.com/processing/processing/issues/3028
+
 earlier
 X size(640,360 , P3D) doesn't work properly
 X   https://github.com/processing/processing/issues/2924
diff --git a/java/libraries/dxf/build.xml b/java/libraries/dxf/build.xml
index 626011a2a..bc3d8ec47 100644
--- a/java/libraries/dxf/build.xml
+++ b/java/libraries/dxf/build.xml
@@ -21,7 +21,8 @@
 	   classpath="../../../core/library/core.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/ecj.jar" />
+      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
+                               ../../mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
   
diff --git a/java/libraries/glw/build.xml b/java/libraries/glw/build.xml
index addef0810..1f9ac5e8b 100644
--- a/java/libraries/glw/build.xml
+++ b/java/libraries/glw/build.xml
@@ -21,7 +21,8 @@
 	   classpath="../../../core/library/core.jar; ../../../core/library/jogl-all.jar; ../../../core/library/gluegen-rt.jar" 
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/ecj.jar" />
+      <compilerclasspath path="mode/org.eclipse.jdt.core.jar; 
+                               mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
   
diff --git a/java/libraries/net/build.xml b/java/libraries/net/build.xml
index 584f12415..ccf7f1440 100644
--- a/java/libraries/net/build.xml
+++ b/java/libraries/net/build.xml
@@ -21,7 +21,8 @@
 	   classpath="../../../core/library/core.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/ecj.jar" />
+      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
+                               ../../mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
 
diff --git a/java/libraries/pdf/build.xml b/java/libraries/pdf/build.xml
index c433f9647..fbff90478 100644
--- a/java/libraries/pdf/build.xml
+++ b/java/libraries/pdf/build.xml
@@ -21,7 +21,8 @@
 	   classpath="../../../core/library/core.jar; library/itext.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/ecj.jar" />
+      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
+                               ../../mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
   
diff --git a/java/libraries/serial/build.xml b/java/libraries/serial/build.xml
index a7f23bbc8..613b8e8f6 100644
--- a/java/libraries/serial/build.xml
+++ b/java/libraries/serial/build.xml
@@ -21,7 +21,8 @@
 	   classpath="../../../core/library/core.jar; library/jssc.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/ecj.jar" />
+      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
+                               ../../mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>