From bdf7b44a36265373606da7556d85dfb9c47dcfdd Mon Sep 17 00:00:00 2001
From: kbr <kbr@dev.java.net>
Date: Fri, 18 Aug 2006 23:00:25 +0000
Subject: Standardized JOAL dist target to use same directory names as JOGL
 build

git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@260 03bf7f67-59de-4072-a415-9a990d468a3f
---
 make/build.xml | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/make/build.xml b/make/build.xml
index 317b28b..8ff3829 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -631,25 +631,37 @@
     </target>
 
     <target name="dist" depends="dist.check">
-        <delete file="${jogl.dist.dir}/jogl-src.zip" />
+        <delete file="${joal.dist.dir}/joal-src.zip" />
         <delete>
             <fileset dir="${joal.dist.dir}" includes="joal-natives-*.jar" />
         </delete>
-        <jar destfile="${joal.dist.dir}/joal-natives-win32.jar"
-             basedir="${joal.dist.dir}/joal-win32"
+        <jar destfile="${joal.dist.dir}/joal-natives-windows-i586.jar"
+             basedir="${joal.dist.dir}/joal-win/32"
              includes="joal_native.dll" />
-        <jar destfile="${joal.dist.dir}/joal-natives-linux.jar"
-             basedir="${joal.dist.dir}/joal-linux"
+        <jar destfile="${joal.dist.dir}/joal-natives-linux-i586.jar"
+             basedir="${joal.dist.dir}/joal-linux/32"
              includes="libjoal_native.so" />
-        <jar destfile="${joal.dist.dir}/joal-natives-macosx.jar"
-             basedir="${joal.dist.dir}/joal-macosx"
+        <!-- NOTE: No OpenAL for Linux/AMD64 or Solaris at the moment -->
+        <!-- jar destfile="${joal.dist.dir}/joal-natives-linux-amd64.jar"
+             basedir="${joal.dist.dir}/joal-linux/64"
+             includes="libjoal_native.so" -->
+        <jar destfile="${joal.dist.dir}/joal-natives-macosx-ppc.jar"
+             basedir="${joal.dist.dir}/joal-macosx/ppc"
+             includes="libjoal_native.jnilib" />
+        <jar destfile="${joal.dist.dir}/joal-natives-macosx-universal.jar"
+             basedir="${joal.dist.dir}/joal-macosx/fat"
              includes="libjoal_native.jnilib" />
-        <!-- Note: Solaris builds elided for now as we would have to build OpenAL ourselves -->
-        <!-- jar destfile="${joal.dist.dir}/joal-natives-solsparc.jar"
-             basedir="${joal.dist.dir}/joal-solsparc"
+        <!-- jar destfile="${joal.dist.dir}/joal-natives-solaris-sparc.jar"
+             basedir="${joal.dist.dir}/joal-solsparc/32"
+             includes="libjoal_native.so" -->
+        <!-- jar destfile="${joal.dist.dir}/joal-natives-solaris-sparcv9.jar"
+             basedir="${joal.dist.dir}/joal-solsparc/64"
+             includes="libjoal_native.so" -->
+        <!-- jar destfile="${joal.dist.dir}/joal-natives-solaris-i586.jar"
+             basedir="${joal.dist.dir}/joal-solx86/32"
              includes="libjoal_native.so" -->
-        <!-- jar destfile="${joal.dist.dir}/joal-natives-solx86.jar"
-             basedir="${joal.dist.dir}/joal-solx86"
+        <!-- jar destfile="${joal.dist.dir}/joal-natives-solaris-amd64.jar"
+             basedir="${joal.dist.dir}/joal-solx86/64"
              includes="libjoal_native.so" -->
 	<!-- Build a source archive as well -->
         <zip destfile="${joal.dist.dir}/joal-src.zip"
-- 
cgit v1.2.3