diff options
| author | gfxadmin <[email protected]> | 2006-05-31 00:27:02 +0000 |
|---|---|---|
| committer | gfxadmin <[email protected]> | 2006-05-31 00:27:02 +0000 |
| commit | fd81711d2ae07275403a9a5f261043a28d82b8f5 (patch) | |
| tree | 9bb1108bef4f80f43b585a3dc149beb65919805d | |
| parent | 2054e661c504e5413fedd88571df120885d98837 (diff) | |
jogl/make/build.xml
Add MacOSX fat (universal) to dist build. This should start being uploaded
nightly with tomorrow's nightly build -- jogl-natives-macosx-universal.jar
will be the filename.
Travis
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@792 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 39d3ce785..a4b371bba 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1273,6 +1273,27 @@ </fail> </target> + + <target name="dist.check.macosxfat" if="jogl.dist.dir"> + <condition property="macosxfat.complete"> + <and> + <available file="${jogl.dist.dir}/jogl-macosx/jogl.jar" /> + <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl.jnilib" /> + <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl_awt.jnilib" /> + <available file="${jogl.dist.dir}/jogl-macosx/fat/libjogl_cg.jnilib" /> + </and> + </condition> + <fail unless="macosxfat.complete"> + ****************************************************************** + ** Files are missing from the Mac OS X build. This will cause ** + ** the distribution to be incomplete. Please check the status ** + ** of the Mac OS X build and try again. ** + ****************************************************************** + </fail> + </target> + + + <target name="dist.check.solsparc" if="jogl.dist.dir"> <condition property="solsparc.complete"> <and> @@ -1324,7 +1345,7 @@ </fail> </target> - <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.solsparcv9,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.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86"> <delete file="${jogl.dist.dir}/jogl.jar" /> <delete> <fileset dir="${jogl.dist.dir}" includes="jogl-natives-*.jar" /> @@ -1353,6 +1374,9 @@ <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" /> + <jar destfile="${jogl.dist.dir}/jogl-natives-macosx-universal.jar" + basedir="${jogl.dist.dir}/jogl-macosx/fat" + includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" /> <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-sparc.jar" basedir="${jogl.dist.dir}/jogl-solsparc/32" includes="libjogl.so,libjogl_awt.so,libjogl_drihack.so" /> |