Merge pull request #12 from sampottinger/fix_jdk_naming

Fix JDK naming and cleanup in ant build

build/.gitignore

@@ -1,6 +1,12 @@
 work
 javadoc
 
-macosx/jdk-*
-macosx/javafx-sdk-11.0.2
-macosx/jfx-11.0.2.zip
+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.*

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>
@@ -918,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"
@@ -1163,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">
       <!--
@@ -1174,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"
@@ -1393,6 +1410,7 @@
           <fileset dir="${jfx.path.dist}/legal" includes="**"/>
         </copy>
 
+        <delete failonerror="false" dir="${jfx.path.dist}" />
       </then>
     </if>
 

core/.gitignore

@@ -1,2 +1,3 @@
 bin
+bin-test
 .idea

java/.gitignore

@@ -1,5 +1,5 @@
 reference.zip
 bin
+bin-test
 generated
 mode/JavaMode.jar
-