From 716f3f84b367f1325a679e7c5722f8def01eb78a Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Sat, 21 Sep 2013 16:51:47 -0400
Subject: [PATCH] move to different version of JRE download

---
 build/build-7u40.xml | 26 +++++++++++++++++++++++---
 todo.txt             | 38 +++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/build/build-7u40.xml b/build/build-7u40.xml
index cc350e0ae..55981fae8 100755
--- a/build/build-7u40.xml
+++ b/build/build-7u40.xml
@@ -19,6 +19,14 @@
     </and>
   </condition>
 
+  <!-- Figure out the JRE download location for Linux and Windows. -->
+  <condition property="jre.file" value="jre-7u40-${platform}-i586.tgz"> 
+    <equals arg1="${sun.arch.data.model}" arg2="32" />
+  </condition>
+  <condition property="jre.file" value="jre-7u40-${platform}-x64.tgz"> 
+    <equals arg1="${sun.arch.data.model}" arg2="64" />
+  </condition>
+
   <!--
   <echo message="${java.class.path}" />
   -->
@@ -682,8 +690,10 @@
     <copy file="linux/processing" tofile="linux/work/processing-java" />
     <chmod perm="ugo+x" file="linux/work/processing-java" />
 
+    <!--
     <property name="jre.file" 
 	      value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" />
+    -->
 
     <get src="http://processing.googlecode.com/files/${jre.file}" 
 	 dest="linux/jre.tgz" 
@@ -706,7 +716,7 @@
       <arg value="-xzpf" />
       <arg value="linux/jre.tgz"/>
     </exec>
-
+    <move file="linux/work/jre1.7.0_40" tofile="linux/work/java" />
   </target>
   
   <target name="linux-run" depends="linux-build" 
@@ -879,14 +889,24 @@
     </chmod>
 
     <!-- starting with 2.0a7, require the local JRE + tools.jar -->
+    <!--
     <property name="jre.file" 
 	      value="jre-tools-6u37-windows${sun.arch.data.model}.zip" />
-
+    -->
     <get src="http://processing.googlecode.com/files/${jre.file}" 
-	 dest="windows/jre.zip" 
+	 dest="windows/jre.tgz" 
 	 usetimestamp="true" />
 
+    <!--
     <unzip dest="windows/work" src="windows/jre.zip" overwrite="false"/>
+    -->
+    <!-- Hopefully this is OK with the permissions (unlike Linux), 
+	 since those shouldn't matter on Windows. -->
+    <untar compression="gzip"
+	   dest="windows/work" 
+	   src="windows/jre.tgz" 
+	   overwrite="false" />
+    <move file="windows/work/jre1.7.0_40" tofile="windows/work/java" />
   </target>
   
   <target name="windows-run" depends="windows-build" 
diff --git a/todo.txt b/todo.txt
index 2003bcb99..9660b18b0 100644
--- a/todo.txt
+++ b/todo.txt
@@ -6,8 +6,28 @@ o bad JS mode causing crash on startup
 X   https://github.com/processing/processing/issues/2088
 X   looks like issue that was covered in 2.0.3 changes
 
+build
+X remove video library for other platforms in download
+X update apple.jar file with new version
+X   https://developer.apple.com/legacy/library/samplecode/AppleJavaExtensions/Introduction/Intro.html
+X remove Mangler from tools/Mangler
+o update tools/howto.txt to just point at the correct online location
+X   just remove the howto file
+X appbundler fixes/changes
+X   the "Classes" folder is included
+X     appears to be line 138 of main.m
+o     maybe this is a holdover from OS X Java? don't know.
+X   icon location uses path, even when embedded
+X   add indents to the Info.plist output file
+X     inside writeInfoPlist from AppBundlerTask.java
+o   use Contents/Resources/Java instead of Contents/Java?
+o     this is in main.m. why the change?
+X     doesn't make any difference, just use Contents/Java
+X   any missing args from our app (copyrights/versions?)
+X copy GenericDocumentIcon.icns for placeholder icon
+X   from /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
+
 high
-_ remove video library for other platforms in download
 _ move old Google Code SVN back to processing.org
 _   then cull out the old branches/tags from the Github repo
 _ figure out Android build w/o javac so we can remove tools.jar and javac
@@ -33,22 +53,6 @@ _ changing modes brings the PDE back on the second screen
 _   the Find window (also the save windows) also have the same problem
 
 7u40 switch
-X remove Mangler from tools/Mangler
-o update tools/howto.txt to just point at the correct online location
-X   just remove the howto file
-X appbundler fixes/changes
-X   the "Classes" folder is included
-X     appears to be line 138 of main.m
-o     maybe this is a holdover from OS X Java? don't know.
-X   icon location uses path, even when embedded
-X   add indents to the Info.plist output file
-X     inside writeInfoPlist from AppBundlerTask.java
-o   use Contents/Resources/Java instead of Contents/Java?
-o     this is in main.m. why the change?
-X     doesn't make any difference, just use Contents/Java
-X   any missing args from our app (copyrights/versions?)
-X copy GenericDocumentIcon.icns for placeholder icon
-X   from /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
 _ don't re-copy jre into work folder if already exists
 _ change how export is handled
 _   remove ability to export cross-platform apps