Normalized gluegen-rt-natives jar file names using new definitions

from gluegen-cpptasks.xml


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@45 a78bb65f-1512-4460-ba86-f6dc96a7bf27

1 files changed, 3 insertions, 30 deletions

diff --git a/make/build.xml b/make/build.xml
index 9d90f4a..5b8da31 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -169,112 +169,89 @@
       <echo message="Win32.VC6" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
       <property name="linker.cfg.id"                        value="linker.cfg.win32.msvc" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-windows-i586.jar" />
     </target>
     
     <target name="declare.win32.vc7" if="isVC7">
       <echo message="Win32.VC7" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
       <property name="linker.cfg.id"                        value="linker.cfg.win32.msvc" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-windows-i586.jar" />
     </target>
     
     <target name="declare.win32.vc8" if="isVC8">
       <echo message="Win32.VC8" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
       <property name="linker.cfg.id"                        value="linker.cfg.win32.msvc" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-windows-i586.jar" />
     </target>
     
     <target name="declare.win32.vc8_x64" if="isVC8_X64">
       <echo message="Win32.VC8_X64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
       <property name="linker.cfg.id"                        value="linker.cfg.win32.msvc" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-windows-amd64.jar" />
     </target>
     
     <target name="declare.win32.mingw" if="isMingW">
       <echo message="Win32.MingW" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
       <property name="linker.cfg.id"                        value="linker.cfg.win32.mingw" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-windows-i586.jar" />
     </target>
 
     <target name="declare.win32" depends="declare.win32.vc6,declare.win32.vc7,declare.win32.vc8,declare.win32.vc8_x64,declare.win32.mingw" if="isWindows" >
       <property name="c.src.dir"                            value="windows" />
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/win32" />
-      <property name="gluegen.rt.natives.dso"               value="gluegen-rt.dll" />
     </target>
 
     <target name="declare.linux.x86" if="isLinuxX86">
       <echo message="Linux.x86" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-linux-i586.jar" />
     </target>
     
     <target name="declare.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
       <property name="linker.cfg.id"                        value="linker.cfg.linux.amd64" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-linux-amd64.jar" />
     </target>
     
     <target name="declare.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-linux-ia64.jar" />
     </target>
 
     <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" >
       <property name="c.src.dir"                            value="unix" />
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
-      <property name="gluegen.rt.natives.dso"               value="libgluegen-rt.so" />
     </target>
 
     <target name="declare.solaris32" if="isSolaris32Bit">
       <echo message="Solaris" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.solaris" /> 
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-solaris-${os.arch}.jar" />
     </target>
  
     <target name="declare.solarisSparcv9" if="isSolarisSparcv9">
       <echo message="SolarisSparcv9" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.solaris.sparcv9" /> 
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-solaris-sparcv9.jar" />
     </target>
 
     <target name="declare.solarisAMD64" if="isSolarisAMD64">
       <echo message="SolarisAMD64" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.solaris.amd64" /> 
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-solaris-amd64.jar" />
     </target>
    
     <target name="declare.solaris" depends="declare.solaris32,declare.solarisSparcv9,declare.solarisAMD64" if="isSolaris" >
       <property name="c.src.dir"                            value="unix" />
       <property name="java.includes.dir.platform"           value="${java.includes.dir}/solaris" />
-      <property name="gluegen.rt.natives.dso"               value="libgluegen-rt.so" />
     </target>
 
-    <target name="declare.macosx.ppc" unless="macosxfat">
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-macosx-ppc.jar" />
-    </target>
-
-    <target name="declare.macosx.universal" if="macosxfat">
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-macosx-universal.jar" />
-    </target>
-
-    <target name="declare.macosx" depends="declare.macosx.ppc,declare.macosx.universal" if="isOSX">
+    <target name="declare.macosx" if="isOSX">
       <echo message="MacOSX" />
       <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" /> 
       <property name="linker.cfg.id"                        value="linker.cfg.macosx" /> 
       <property name="c.src.dir"                            value="macosx" />
       <property name="java.includes.dir.platform"           value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" />
-      <property name="gluegen.rt.natives.dso"               value="libgluegen-rt.jnilib" />
     </target>
     
     <target name="declare.freebsd" if="isFreeBSD">
@@ -283,8 +260,6 @@
       <property name="linker.cfg.id"                        value="linker.cfg.linux" />
       <property name="c.src.dir"                            value="unix" />
       <property name="java.includes.dir.freebsd"            value="${java.includes.dir}/freebsd" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-freebsd-i586.jar" />
-      <property name="gluegen.rt.natives.dso"               value="libgluegen-rt.so" />
     </target>
 
     <target name="declare.hpux" if="isHPUX">
@@ -293,8 +268,6 @@
       <property name="linker.cfg.id"                        value="linker.cfg.hpux" />
       <property name="c.src.dir"                            value="unix" />
       <property name="java.includes.dir.hpux"               value="${java.includes.dir}/hp-ux" />
-      <property name="gluegen.rt.natives.jar"               value="gluegen-rt-natives-hpux-hppa.jar" />
-      <property name="gluegen.rt.natives.dso"               value="libgluegen-rt.so" />
     </target>
 
     <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.detect.compiler,setup.java.home.dir,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" >
@@ -372,9 +345,9 @@
       <antcall target="c.rename.lib.mingw" inheritRefs="true" />
       <antcall target="c.rename.lib.macosx" inheritRefs="true" />
       <!-- Create Java Web Start jar file from built file -->
-      <jar destfile="../build/${gluegen.rt.natives.jar}">
+      <jar destfile="../build/gluegen-rt-natives-${os.and.arch}.jar">
         <fileset dir="../build/obj">
-          <include name="${gluegen.rt.natives.dso}" />
+          <include name="*gluegen-rt.${native.library.suffix}" />
         </fileset>
       </jar>
     </target>