diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml index 91545b81b..bff79f339 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1130,6 +1130,25 @@ </fail> </target> + <target name="dist.check.windows-amd64" if="jogl.dist.dir"> + <condition property="windows-amd64.complete"> + <and> + <available file="${jogl.dist.dir}/jogl-win/64/jogl.dll" /> + <available file="${jogl.dist.dir}/jogl-win/64/jogl_awt.dll" /> + <available file="${jogl.dist.dir}/jogl-win/64/jogl_cg.dll" /> + <available file="${jogl.dist.dir}/jogl-win/64/gluegen-rt.dll" /> + <available file="${jogl.dist.dir}/jogl-win/64/gluegen-rt-natives-windows-amd64.jar" /> + </and> + </condition> + <fail unless="windows-amd64.complete"> + ********************************************************************* + ** Files are missing from the Windows/AMD64 build. This will cause ** + ** the distribution to be incomplete. Please check the status ** + ** of the Windows/AMD64 build and try again. ** + ********************************************************************* + </fail> + </target> + <target name="dist.check.linux" if="jogl.dist.dir"> <condition property="linux.complete"> <and> @@ -1158,7 +1177,7 @@ </target> <target name="dist.check.linux-amd64" if="jogl.dist.dir"> - <condition property="linux.complete"> + <condition property="linux-amd64.complete"> <and> <available file="${jogl.dist.dir}/jogl-linux/64/libjogl.so" /> <available file="${jogl.dist.dir}/jogl-linux/64/libjogl_awt.so" /> @@ -1167,12 +1186,12 @@ <available file="${jogl.dist.dir}/jogl-linux/64/gluegen-rt-natives-linux-amd64.jar" /> </and> </condition> - <fail unless="linux.complete"> - ****************************************************************** - ** Files are missing from the Linux build. This will cause ** - ** the distribution to be incomplete. Please check the status ** - ** of the Linux build and try again. ** - ****************************************************************** + <fail unless="linux-amd64.complete"> + ******************************************************************* + ** Files are missing from the Linux/AMD64 build. This will cause ** + ** the distribution to be incomplete. Please check the status ** + ** of the Linux/AMD64 build and try again. ** + ******************************************************************* </fail> </target> @@ -1326,7 +1345,7 @@ includes="${jogl.tmp.version}/**" /> </target> - <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86, dist.check.solamd64"> + <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86, dist.check.solamd64"> <delete> <fileset dir="${jogl.dist.dir}" includes="*.jar" /> </delete> @@ -1356,6 +1375,9 @@ <jar destfile="${jogl.dist.dir}/jogl-natives-windows-i586.jar" basedir="${jogl.dist.dir}/jogl-win/32" includes="jogl.dll,jogl_awt.dll,jogl_cg.dll" /> + <jar destfile="${jogl.dist.dir}/jogl-natives-windows-amd64.jar" + basedir="${jogl.dist.dir}/jogl-win/64" + includes="jogl.dll,jogl_awt.dll,jogl_cg.dll" /> <jar destfile="${jogl.dist.dir}/jogl-natives-linux-i586.jar" basedir="${jogl.dist.dir}/jogl-linux/32" includes="libjogl.so,libjogl_awt.so,libjogl_cg.so" /> @@ -1387,6 +1409,9 @@ <fileset dir="${jogl.dist.dir}/jogl-win/32" includes="gluegen-natives-*.jar" /> </copy> <copy todir="${jogl.dist.dir}"> + <fileset dir="${jogl.dist.dir}/jogl-win/64" includes="gluegen-natives-*.jar" /> + </copy> + <copy todir="${jogl.dist.dir}"> <fileset dir="${jogl.dist.dir}/jogl-linux/32" includes="gluegen-natives-*.jar" /> </copy> <copy todir="${jogl.dist.dir}"> @@ -1475,6 +1500,11 @@ <param name="zip.so.suffix" value=".dll" /> <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-win/32" /> </antcall> + <antcall target="dist.build.zip" inheritAll="true"> + <param name="zip.os.arch" value="windows-amd64" /> + <param name="zip.so.suffix" value=".dll" /> + <param name="zip.src.so.dir" value="${jogl.dist.dir}/jogl-win/64" /> + </antcall> <!-- Create one last zip archive by hand, this one containing all of the --> <!-- Java Web Start jar files (for easier redistribution) --> <zip destfile="${jogl.dist.dir}/jogl-${tmp.version}-webstart.zip" |