Merged changes from dev-1_4 branch into the main trunk.

NOTE: all 1.4 development will now proceed on the main trunk. The dev-1_4 branch is closed.


git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@445 ba19aa83-45c5-6ac9-afd3-db810772062c

8 files changed, 233 insertions, 7 deletions

diff --git a/src/native/share/build-linux-amd64.xml b/src/native/share/build-linux-amd64.xml
index d3ff24b..5f49d61 100644
--- a/src/native/share/build-linux-amd64.xml
+++ b/src/native/share/build-linux-amd64.xml
@@ -27,7 +27,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
-	<arg line="-m64 -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-m64 -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
diff --git a/src/native/share/build-linux-i586.xml b/src/native/share/build-linux-i586.xml
index 61d4434..29ee376 100644
--- a/src/native/share/build-linux-i586.xml
+++ b/src/native/share/build-linux-i586.xml
@@ -27,7 +27,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
-	<arg line="-m32 -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-m32 -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
diff --git a/src/native/share/build-linux-ia64.xml b/src/native/share/build-linux-ia64.xml
index 8188048..2457b35 100644
--- a/src/native/share/build-linux-ia64.xml
+++ b/src/native/share/build-linux-ia64.xml
@@ -27,7 +27,7 @@
 
     <!-- Compile the c source files; based on build-linux-amd64.xml-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
-	<arg line=" -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line=" -I/include -I${java.home}/../include -I${java.home}/../include/linux -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file; based on build-linux-amd64.xml-->
diff --git a/src/native/share/build-linux-ppc.xml b/src/native/share/build-linux-ppc.xml
new file mode 100644
index 0000000..50154d6
--- /dev/null
+++ b/src/native/share/build-linux-ppc.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<!--
+/*
+ * $RCSfile$
+ *
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * $Revision$
+ * $Date$
+ * $State$
+ */
+ -->
+
+<!-- Ant file for building native utilities files for Linux -->
+<project name="Java 3D" default="compile">
+
+  <target name="compile">
+
+    <echo message="Executing 64 bit native utilities build [${bldType}]"/>
+
+    <!-- Create the build directories linux -->
+    <mkdir dir="${build}/${platform}/${bldType}/native/share/objs"/>
+    <mkdir dir="${build}/${platform}/${bldType}/bin"/>
+
+    <!-- Compile the c source files-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
+	<arg line="-I/include -I${java.home}/../include -I${java.home}/../include/linux -I${javahUtilsTarget} ${bldFlag} -DLINUX -c ${core_utils_src}/native/share/J3DTimer.c"/>
+    </exec>
+
+    <!-- Create the library file-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="ld">
+	<arg line="J3DTimer.o -G -z lazyload -lc -o libj3dutils.so"/>
+    </exec>
+
+    <!-- Copy the copyright library file -->
+    <copy file="${build}/${platform}/${bldType}/native/share/objs/libj3dutils.so" 
+	 todir="${build}/${platform}/${bldType}/bin"/>
+
+  </target>
+
+  <target name="dist">
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/${platform}/bin"/>
+
+    <!-- Copy the library files -->
+    <copy file="${build}/${platform}/opt/bin/libj3dutils.so"
+	 todir="${dist}/${platform}/bin"/>
+  </target>
+
+
+</project>
diff --git a/src/native/share/build-solaris-sparc-forte.xml b/src/native/share/build-solaris-sparc-forte.xml
index 3ffe83f..43b2ee1 100644
--- a/src/native/share/build-solaris-sparc-forte.xml
+++ b/src/native/share/build-solaris-sparc-forte.xml
@@ -27,7 +27,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="cc">
-	<arg line="-v -xCC -xchip=ultra -xarch=v8a -xcode=pic32 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-v -xCC -xchip=ultra -xarch=v8a -xcode=pic32 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
@@ -48,7 +48,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs/sparcv9" executable="cc">
-	<arg line="-v -xCC -xchip=ultra -xarch=v9a -xcode=pic32 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-v -xCC -xchip=ultra -xarch=v9a -xcode=pic32 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
diff --git a/src/native/share/build-solaris-sparc-gcc.xml b/src/native/share/build-solaris-sparc-gcc.xml
index f179591..afe17b4 100644
--- a/src/native/share/build-solaris-sparc-gcc.xml
+++ b/src/native/share/build-solaris-sparc-gcc.xml
@@ -27,7 +27,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
-	<arg line="-m32 -mcpu=v9 -mtune=v9 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-m32 -mcpu=v9 -mtune=v9 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
@@ -48,7 +48,7 @@
 
     <!-- Compile the c source files-->
     <exec dir="${build}/${platform}/${bldType}/native/share/objs/sparcv9" executable="gcc">
-	<arg line="-m64 -mcpu=v9 -mtune=v9 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} -${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+	<arg line="-m64 -mcpu=v9 -mtune=v9 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
     </exec>
 
     <!-- Create the library file-->
diff --git a/src/native/share/build-solaris-x86-forte.xml b/src/native/share/build-solaris-x86-forte.xml
new file mode 100644
index 0000000..8f72eb7
--- /dev/null
+++ b/src/native/share/build-solaris-x86-forte.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+/*
+ * $RCSfile$
+ *
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * $Revision$
+ * $Date$
+ * $State$
+ */
+ -->
+
+<!-- Ant file for building native utilities files for Solaris -->
+<project name="Java 3D" default="compile">
+
+  <target name="compile">
+
+    <echo message="Executing 32 bit native utilities build [${bldType}]"/>
+
+    <!-- Create the build directories i386 -->
+    <mkdir dir="${build}/${platform}/${bldType}/native/share/objs"/>
+    <mkdir dir="${build}/${platform}/${bldType}/lib/i386"/>
+
+    <!-- Compile the c source files-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="cc">
+	<arg line="-v -xCC -xchip=pentium3 -xarch=generic -KPIC -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+    </exec>
+
+    <!-- Create the library file-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="ld">
+	<arg line="J3DTimer.o -G -z lazyload -lposix4 -lc -o libj3dutils.so"/>
+    </exec>
+
+    <!-- Copy the copyright library file -->
+    <copy file="${build}/${platform}/${bldType}/native/share/objs/libj3dutils.so" 
+	 todir="${build}/${platform}/${bldType}/lib/i386"/>
+
+    <!--
+    /*
+     *  TODO: only do the 64-bit build if isSolarisOnX86_64 property is
+     *  set, indicating that a 64-bit JVM is available
+     */
+     -->
+
+<!-- ********************************************************************** -->
+    <echo message="Executing 64 bit native utilities build [${bldType}]"/>
+
+    <!-- Create the build directories amd64 -->
+    <mkdir dir="${build}/${platform}/${bldType}/native/share/objs/amd64"/>
+    <mkdir dir="${build}/${platform}/${bldType}/lib/amd64"/>
+
+    <!-- Compile the c source files-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs/amd64" executable="cc">
+	<arg line="-v -xCC -xchip=opteron -xarch=amd64 -KPIC -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+    </exec>
+
+    <!-- Create the library file-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs/amd64" executable="ld">
+	<arg line="J3DTimer.o -G -z lazyload -lposix4 -lc -o libj3dutils.so"/>
+    </exec>
+
+    <!-- Copy the copyright library file -->
+    <copy file="${build}/${platform}/${bldType}/native/share/objs/amd64/libj3dutils.so" 
+	 todir="${build}/${platform}/${bldType}/lib/amd64"/>
+
+  </target>
+
+  <target name="dist">
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/${platform}/lib/i386"/>
+    <mkdir dir="${dist}/${platform}/lib/amd64"/>
+
+    <!-- Copy the library files -->
+    <copy file="${build}/${platform}/opt/lib/i386/libj3dutils.so"
+	 todir="${dist}/${platform}/lib/i386"/>
+
+    <copy file="${build}/${platform}/opt/lib/amd64/libj3dutils.so"
+	 todir="${dist}/${platform}/lib/amd64"/>
+  </target>
+
+
+</project>
diff --git a/src/native/share/build-solaris-x86-gcc.xml b/src/native/share/build-solaris-x86-gcc.xml
new file mode 100644
index 0000000..01ffdc4
--- /dev/null
+++ b/src/native/share/build-solaris-x86-gcc.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+/*
+ * $RCSfile$
+ *
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * $Revision$
+ * $Date$
+ * $State$
+ */
+ -->
+
+<!-- Ant file for building native utilities files for Solaris -->
+<project name="Java 3D" default="compile">
+
+  <target name="compile">
+
+    <echo message="Executing 32 bit native utilities build [${bldType}]"/>
+
+    <!-- Create the build directories i386 -->
+    <mkdir dir="${build}/${platform}/${bldType}/native/share/objs"/>
+    <mkdir dir="${build}/${platform}/${bldType}/lib/i386"/>
+
+    <!-- Compile the c source files-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="gcc">
+	<arg line="-m32 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+    </exec>
+
+    <!-- Create the library file-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs" executable="ld">
+	<arg line="J3DTimer.o -G -z lazyload -lposix4 -lc -o libj3dutils.so"/>
+    </exec>
+
+    <!-- Copy the copyright library file -->
+    <copy file="${build}/${platform}/${bldType}/native/share/objs/libj3dutils.so" 
+	 todir="${build}/${platform}/${bldType}/lib/i386"/>
+
+    <!--
+    /*
+     *  TODO: only do the 64-bit build if isSolarisOnX86_64 property is
+     *  set, indicating that a 64-bit JVM is available
+     */
+     -->
+
+<!-- ********************************************************************** -->
+    <echo message="Executing 64 bit native utilities build [${bldType}]"/>
+
+    <!-- Create the build directories amd64 -->
+    <mkdir dir="${build}/${platform}/${bldType}/native/share/objs/amd64"/>
+    <mkdir dir="${build}/${platform}/${bldType}/lib/amd64"/>
+
+    <!-- Compile the c source files-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs/amd64" executable="gcc">
+	<arg line="-m64 -I/include -I${java.home}/../include -I${java.home}/../include/solaris -I/usr/openwin/include -I${javahUtilsTarget} ${bldFlag} -DSOLARIS -c ${core_utils_src}/native/share/J3DTimer.c"/>
+    </exec>
+
+    <!-- Create the library file-->
+    <exec dir="${build}/${platform}/${bldType}/native/share/objs/amd64" executable="ld">
+	<arg line="J3DTimer.o -G -z lazyload -lposix4 -lc -o libj3dutils.so"/>
+    </exec>
+
+    <!-- Copy the copyright library file -->
+    <copy file="${build}/${platform}/${bldType}/native/share/objs/amd64/libj3dutils.so" 
+	 todir="${build}/${platform}/${bldType}/lib/amd64"/>
+
+  </target>
+
+  <target name="dist">
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/${platform}/lib/i386"/>
+    <mkdir dir="${dist}/${platform}/lib/amd64"/>
+
+    <!-- Copy the library files -->
+    <copy file="${build}/${platform}/opt/lib/i386/libj3dutils.so"
+	 todir="${dist}/${platform}/lib/i386"/>
+
+    <copy file="${build}/${platform}/opt/lib/amd64/libj3dutils.so"
+	 todir="${dist}/${platform}/lib/amd64"/>
+  </target>
+
+
+</project>