From fe69d9add3b84d780f5c661fb04a3dd914b49ac2 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Thu, 16 Jul 2015 14:55:31 -0400
Subject: [PATCH] re-arrange to make sure downloader.jar is built

---
 build/build.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index c0d12676d..011d2ff17 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -190,11 +190,6 @@
   <echo message="${java.class.path}" />
   -->
 
-  <!-- our special JRE downloader task -->
-  <taskdef name="downloader" 
-	   classname="Downloader"
-	   classpath="jre/downloader.jar" />
-
   <!-- Set a property named macosx, linux, or windows. 
        The 'value' chosen is arbitrary. -->
   <property name="${platform}" value="${platform}" />
@@ -203,19 +198,19 @@
 
   <property name="jre.tgz.path" value="${platform}/jre-${jdk.short}.tgz" />
 
+  <!-- make sure we're built -->
+  <subant buildpath="jre" target="dist" />
+
+  <!-- our special JRE downloader task -->
+  <taskdef name="downloader" 
+	   classname="Downloader"
+	   classpath="jre/downloader.jar" />
+
   <target name="jre-check"> 
     <available file="${jre.tgz.path}" property="jre.tgz.downloaded" />
   </target>
 
   <target name="jre-download" depends="jre-check" unless="jre.tgz.downloaded">
-    <!-- make sure we're built -->
-    <subant buildpath="jre" target="dist" />
-
-    <!-- our special JRE downloader task -->
-    <taskdef name="downloader" 
-	     classname="Downloader"
-	     classpath="jre/downloader.jar" />
-
     <downloader version="${jdk.version}" 
                 update="${jdk.update}" 
                 build="${jdk.build}"