From d87032d2789ae84a9eb5f33f975931b0eeb1f766 Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 10 Oct 2019 21:27:08 -0700
Subject: [PATCH 1/5] Updated gitignores for bin-test and JDKs.

In response to https://github.com/processing/processing4/issues/6, update gitignores so that JDKs and bin-test are excluded.
---
 build/.gitignore | 6 ++----
 core/.gitignore  | 1 +
 java/.gitignore  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/.gitignore b/build/.gitignore
index 177ce2a9b..b2fc08c93 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -2,7 +2,5 @@ work
 javadoc
 
 jre/bin-test
-macosx/javafx-sdk-11.0.2
-macosx/jdk-0u4.tgz
-macosx/jdk-11.0.4+11
-macosx/jfx-11.0.2.zip
+macosx/javafx-sdk-*
+macosx/jdk-11.*
diff --git a/core/.gitignore b/core/.gitignore
index 84e7b5c83..bc2b2d6cf 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,2 +1,3 @@
 bin
+bin-test
 .idea
diff --git a/java/.gitignore b/java/.gitignore
index 325dcf926..4eecb6de1 100644
--- a/java/.gitignore
+++ b/java/.gitignore
@@ -1,5 +1,5 @@
 reference.zip
 bin
+bin-test
 generated
 mode/JavaMode.jar
-

From c1077d993fb77d9256c81dbbd95baf793bde44f0 Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 10 Oct 2019 21:34:35 -0700
Subject: [PATCH 2/5] Update naming convention for JDK downloads.

In response to https://github.com/processing/processing4/issues/6, fix up naming for JDK downloads and some leftover .gitignore edits.
---
 build/.gitignore | 9 +++++++++
 build/build.xml  | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/.gitignore b/build/.gitignore
index b2fc08c93..53dbd6552 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -2,5 +2,14 @@ work
 javadoc
 
 jre/bin-test
+
+# Not sure what crazy collisions we would have but leaving these explicit
 macosx/javafx-sdk-*
 macosx/jdk-11.*
+macosx/jfx-11.*
+windows/javafx-sdk-*
+windows/jdk-11.*
+windows/jfx-11.*
+linux/javafx-sdk-*
+linux/jdk-11.*
+linux/jfx-11.*
diff --git a/build/build.xml b/build/build.xml
index 2500ded8a..1681e792e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -105,8 +105,6 @@
   <property name="jdk.hash" value="59066701cf1a433da9770636fbc4c9aa" />
   -->
 
-  <property name="jdk.short" value="${jdk.version}u${jdk.update}" />
-
   <property name="jdk.prefix" value="jdk" />
   <property name="jdk.separator" value="-" />
   <property name="jdk.esoteric" value="${jdk.train}.${jdk.version}.${jdk.update}" />
@@ -263,7 +261,7 @@
       <property name="target-platform" value="@{platform}" />
       <property name="${target-platform}" value="${target-platform}" />
 
-      <property name="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.tgz" />
+      <property name="jdk.tgz.path" value="${target-platform}/jdk-${jdk.esoteric}.tgz" />
 
       <property name="jdk.data.model" value="@{datamodel}" />
 
@@ -273,13 +271,13 @@
 
       <property name="jfx.path.lib" value="${jfx.path.dist}/lib" />
 
-      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.tgz">
+      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.esoteric}.tgz">
         <not>
           <equals arg1="${target-platform}" arg2="windows" />
         </not>
       </condition>
 
-      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.zip">
+      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.esoteric}.zip">
         <equals arg1="${target-platform}" arg2="windows" />
       </condition>
     </sequential>

From 27836ac1a7919e501f43f01e562cece3bc675ab0 Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 10 Oct 2019 22:38:12 -0700
Subject: [PATCH 3/5] Started temp directory cleanup for JDK working files.

---
 build/build.xml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 1681e792e..17bca3517 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -916,6 +916,17 @@
       <fileset dir="${launch4j.dir}/bin" includes="windres-*" />
     </delete>
 
+    <!-- remove temporary files -->
+    <exec executable="rm">
+      <arg value="-r"/>
+      <arg line="${jdk.path.macosx}"/>
+    </exec>
+
+    <exec executable="rm">
+      <arg value="-r"/>
+      <arg line="${jfx.path.dist}"/>
+    </exec>
+
   </target>
 
   <target name="macosx-run" depends="macosx-build"
@@ -1161,9 +1172,6 @@
       <arg value="work/java/" />
     </exec>
 
-    <delete dir="linux/jdk${jdk.esoteric}" failonerror="false" />
-    <delete dir="linux/jdk${jdk.esoteric}" failonerror="false" />
-
     <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
       <!--
@@ -1172,6 +1180,17 @@
       -->
       <fileset refid="jdk-optional-linux" />
     </delete>
+
+    <exec executable="rm">
+      <arg value="-r"/>
+      <arg line="linux/jdk-${jdk.esoteric}+${jdk.build}"/>
+    </exec>
+
+    <exec executable="rm">
+      <arg value="-r"/>
+      <arg line="${jfx.path.dist}"/>
+    </exec>
+
   </target>
 
   <target name="linux-run" depends="linux-build"

From cfd61a074a4008d09fb3ebc0492165a4a4081f41 Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 10 Oct 2019 23:08:28 -0700
Subject: [PATCH 4/5] Fix windows javafx temp folder cleanup.

Remove the javafx expansion of the zip archive on windows after build completes.
---
 build/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build.xml b/build/build.xml
index 17bca3517..bdc07d600 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1410,6 +1410,7 @@
           <fileset dir="${jfx.path.dist}/legal" includes="**"/>
         </copy>
 
+        <delete failonerror="false" dir="${jfx.path.dist}" />
       </then>
     </if>
 

From 48786a88d08ceacd3399bb8283210c25e0604a1a Mon Sep 17 00:00:00 2001
From: A Pottinger <samp@gleap.org>
Date: Thu, 10 Oct 2019 23:25:06 -0700
Subject: [PATCH 5/5] Remove comment on gitignore for build.

---
 build/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/.gitignore b/build/.gitignore
index 9eaaf5bbf..7c4bf3a86 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,7 +1,6 @@
 work
 javadoc
 
-# Not sure what crazy collisions we would have but leaving these explicit
 macosx/javafx-sdk-*
 macosx/jdk-11.*
 macosx/jfx-11.*