summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgfxadmin <[email protected]>2006-04-28 01:30:14 +0000
committergfxadmin <[email protected]>2006-04-28 01:30:14 +0000
commit75033da0c4cf32c424da616aa91ecadfe9fec049 (patch)
treeb8c29a02f7af92b70abcc47195b49b31bfd4bf0e
parent97ab9cd1ef50c9e723454c57a1d8e0b24be253e6 (diff)
Issue number:
Obtained from: Submitted by: Travis Reviewed by: Add AMD64 native JOGL libraries to nightly build and nightly upload. A file called "jogl-natives-linux-amd64.jar" should appear on jogl page nightly from now on. I couldn't really test all the changes to our string of scripts without updating all the builds right now, so hopefully this will work OK, and if not, I'll fix in the morning. Modified Files: make/build.xml git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@743 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/build.xml22
1 files changed, 21 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 044154060..a5ddbe346 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1234,6 +1234,23 @@
</fail>
</target>
+ <target name="dist.check.linux-amd64" if="jogl.dist.dir">
+ <condition property="linux.complete">
+ <and>
+ <available file="${jogl.dist.dir}/jogl-linux/64/libjogl.so" />
+ <available file="${jogl.dist.dir}/jogl-linux/64/libjogl_awt.so" />
+ <available file="${jogl.dist.dir}/jogl-linux/64/libjogl_cg.so" />
+ </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>
+ </target>
+
<target name="dist.check.macosx" if="jogl.dist.dir">
<condition property="macosx.complete">
<and>
@@ -1286,7 +1303,7 @@
</fail>
</target>
- <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.linux,dist.check.macosx,dist.check.solsparc,dist.check.solx86">
+ <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.solsparc,dist.check.solx86">
<delete file="${jogl.dist.dir}/jogl.jar" />
<delete>
<fileset dir="${jogl.dist.dir}" includes="jogl-natives-*.jar" />
@@ -1309,6 +1326,9 @@
<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,libjogl_drihack.so" />
+ <jar destfile="${jogl.dist.dir}/jogl-natives-linux-amd64.jar"
+ basedir="${jogl.dist.dir}/jogl-linux/64"
+ includes="libjogl.so,libjogl_awt.so,libjogl_cg.so,libjogl_drihack.so" />
<jar destfile="${jogl.dist.dir}/jogl-natives-macosx-ppc.jar"
basedir="${jogl.dist.dir}/jogl-macosx/ppc"
includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" />