Fix Solaris gcc args ; Adding JVM arch flags (-d32/-d64)

4 files changed, 44 insertions, 5 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index 0913003..c476ff7 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -245,6 +245,7 @@ export ${system.env.library.path}=${env.TARGET_ROOT}/gluegen/${rootrel.build}/ob
             <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/>
             <echo message="${line.separator}
 java \${line.separator}
+${jvmarg.arch}
 -Djava.library.path=${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj${path.separator}${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives\${line.separator}
 -cp ${junit.run.remote.jars}\${line.separator}
 -Dgluegen.root=${gluegen.root} \${line.separator}
@@ -339,6 +340,7 @@ ${line.separator}
         <!-- Perform the junit tests-->
         <junit forkmode="once" showoutput="true" fork="true" timeout="${batchtest.timeout}">
             <env key="${system.env.library.path}" path="${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/>
+            <jvmarg value="${jvmarg.arch}"/>
             <jvmarg value="-Djava.library.path=${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/>
             <jvmarg value="-Dgluegen.root=${gluegen.root}"/>
             <jvmarg value="-Drootrel.build=${rootrel.build}"/>
@@ -369,6 +371,9 @@ ${line.separator}
         <property name="gluegen.lib.abs" location="${gluegen.lib}" />
         <property name="build_t.lib.abs" location="${build_t.lib}" />
 
+        <condition property="jvmarg.arch" value="-d64"><isset property="is64Bit"/></condition>
+        <condition property="jvmarg.arch" value="-d32"><not><isset property="is64Bit"/></not></condition>
+
         <delete quiet="true">
             <fileset dir="${build}/test/results" includes="**"/>
             <fileset file="${build}/${test.archive.name}.7z"/>
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index e7af64c..7d28aef 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -40,6 +40,7 @@
    -   isWindows
    -   isWindowsX86
    -   isWindowsAMD64
+   -   is64Bit
    -
    - isX11 is set if: !isWindows && !isOSX && !noX11
    - 
@@ -335,6 +336,19 @@
         <os name="SunOS" arch="amd64" />
     </condition>
 
+    <condition property="is64Bit">
+      <or>
+        <os arch="amd64" />
+        <os arch="AMD64" />
+        <os arch="sparcv9" />
+        <os arch="IA64" />
+        <os arch="AMD64" />
+        <os arch="x86_64" />
+        <os arch="AMD64" />
+        <os arch="x86_64" />
+      </or>
+    </condition>
+
     <echo message="FreeBSD=${isFreeBSD}" />
     <echo message="FreeBSDX86=${isFreeBSDX86}" />
     <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" />
@@ -360,6 +374,7 @@
     <echo message="Unix=${isUnix}" />
     <echo message="Windows=${isWindows}" />
     <echo message="X11=${isX11}" />
+    <echo message="is64Bit=${is64Bit}" />
   </target>
 
   <target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86">
@@ -698,6 +713,7 @@
     <!-- SOLARIS compiler configuration --> 
 
     <compiler id="compiler.cfg.solaris" name="gcc"> 
+      <compilerarg value="-m32"/>
       <defineset> 
         <define name="__unix__"/>
         <define name="__X11__"  if="isX11"/>
@@ -723,10 +739,12 @@
     </compiler> 
 
     <compiler id="compiler.cfg.solaris.amd64" name="gcc"> 
-      <compilerarg value="-fast" /> 
-      <compilerarg value="-xchip=opteron" /> 
-      <compilerarg value="-xarch=amd64" /> 
-      <compilerarg value="-xcache=64/64/2:1024/64/16" /> 
+      <compilerarg value="-fPIC"/>
+      <compilerarg value="-m64"/>
+      <!-- compilerarg value="-fast" /--> 
+      <!-- compilerarg value="-xchip=opteron" / --> 
+      <!-- compilerarg value="-xarch=amd64" / --> 
+      <!-- compilerarg value="-xcache=64/64/2:1024/64/16" / --> 
       <defineset> 
         <define name="__unix__"/>
         <define name="__X11__"  if="isX11"/>
@@ -867,6 +885,7 @@
     <!-- SOLARIS linker configuration --> 
 
     <linker id="linker.cfg.solaris" name="gcc"> 
+      <linkerarg value="-m32"/>
     </linker> 
 
     <linker id="linker.cfg.solaris.sparcv9" name="gcc"> 
@@ -874,7 +893,8 @@
     </linker> 
 
     <linker id="linker.cfg.solaris.amd64" name="gcc"> 
-      <linkerarg value="-xarch=amd64" /> 
+      <linkerarg value="-m64"/>
+      <!-- linkerarg value="-xarch=amd64" / --> 
     </linker>
 
     <!-- MacOSX linker configuration -->
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index f2de867..5c56da4 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -26,5 +26,12 @@ if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then
     export J2RE_HOME JAVA_HOME
 fi 
 
+if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then
+    J2RE_HOME=/opt-solaris-x86/jre6
+    JAVA_HOME=/opt-solaris-x86/j2se6
+    PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+    export J2RE_HOME JAVA_HOME
+fi
+
 export PATH
 
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 9a4678b..695bede 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -26,6 +26,13 @@ if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then
     export J2RE_HOME JAVA_HOME
 fi
 
+if [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then
+    J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64
+    JAVA_HOME=/opt-solaris-x86_64/j2se6/bin/amd64
+    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
+    export J2RE_HOME JAVA_HOME
+fi
+
 export PATH