Append JDK indicator to binary distribution using system property java.specification...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_90@345582 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 1c57d10a6f3dd1772854da908511254a0aaadaed..eb4c31342a100afbe3f23d4852497855f294ae36 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1081,9 +1081,10 @@ NOTE:
     <copy todir="${dist.bin.result.dir}/build" file="build/fop.jar"/>
     <chmod file="${dist.bin.result.dir}/fop" perm="ugo+rx"/>
 
-    <zip zipfile="${name}-${version}-bin.zip" basedir="${dist.bin.dir}" includes="**"/>
+    <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
+    <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
     <tar longfile="gnu"
-         destfile="${name}-${version}-bin.tar" >
+         destfile="${name}-${version}-${bin.suffix}.tar">
       <tarfileset dir="${dist.bin.dir}" mode="755">
         <include name="${name}-${version}/fop"/>
       </tarfileset>
@@ -1092,8 +1093,8 @@ NOTE:
         <exclude name="${name}-${version}/fop"/>
       </tarfileset>
     </tar>
-    <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/>
-    <delete file="${name}-${version}-bin.tar"/>
+    <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/>
+    <delete file="${name}-${version}-${bin.suffix}.tar"/>
   </target>
 
   <target name="dist-src" depends="all">