split solaris 32bit (x86/sparc), use jvmDataModel.arg set by gluegenv2.0-rc4

6 files changed, 40 insertions, 12 deletions

diff --git a/build.xml b/build.xml
index bf34597c..300ae362 100644
--- a/build.xml
+++ b/build.xml
@@ -34,6 +34,10 @@
         <isset property="c.dont.compile"/>
     </condition>
     
+    <target name="-pre-init" depends="gluegen.cpptasks.detect.os">
+        <!-- gluegen.cpptasks... sets jvmDataModel.arg -->
+    </target>
+
     <!-- -post-init is after all properties are imported -->
     <target name="-post-init" depends="jogamp.env.init,gluegen.cpptasks.detect.os">
         <property name="jocl.version" value="${jocl_base_version}-b${jocl.build.number}-${version.timestamp}" />
@@ -415,10 +419,15 @@
       <!-- a hackish way on Solaris10 w/ gcc in 'sfw'
            to make mmintrin.h, pmmintrin.h and xmmintrin.h visible -->
 
-      <compiler id="compiler.cfg.solaris.jocl" extends="compiler.cfg.solaris">
+      <compiler id="compiler.cfg.solaris.jocl.x86" extends="compiler.cfg.solaris">
         <compilerarg value="-I/usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/install-tools/include" />
       </compiler>
 
+      <compiler id="compiler.cfg.solaris.jocl.sparc" extends="compiler.cfg.solaris">
+        <!-- dunno .. need to fix, if we ever compile on Solaris/sparcv9 -->
+        <compilerarg value="-I/usr/sfw/lib/gcc/sparc-pc-solaris2.10/3.4.3/install-tools/include" />
+      </compiler>
+
       <compiler id="compiler.cfg.solaris.jocl.sparcv9" extends="compiler.cfg.solaris.sparcv9">
         <!-- dunno .. need to fix, if we ever compile on Solaris/sparcv9 -->
         <compilerarg value="-I/usr/sfw/lib/gcc/sparc-pc-solaris2.10/3.4.3/install-tools/include" />
@@ -474,7 +483,7 @@
     <target name="c.configure.os"      depends="c.configure.win, c.configure.linux, c.configure.macosx, c.configure.solaris" />
     <target name="c.configure.win"     depends="c.configure.win.mingw32, c.configure.win.mingw64" if="isWindows" />
     <target name="c.configure.linux"   depends="c.configure.linux.x86, c.configure.linux.amd64, c.configure.linux.armv7" if="isLinux" />
-    <target name="c.configure.solaris" depends="c.configure.solaris32, c.configure.solaris.sparcv9, c.configure.solaris.amd64" if="isSolaris" />
+    <target name="c.configure.solaris" depends="c.configure.solaris.x86, c.configure.solaris.sparc, c.configure.solaris.sparcv9, c.configure.solaris.amd64" if="isSolaris" />
 
     <target name="c.configure.win.mingw32" if="isMingW32">
         <echo message="Win.Ming32W" />
@@ -502,9 +511,15 @@
         <property name="linker.cfg.id"    value="linker.cfg.linux.armv7.jocl" />
     </target>
 
-    <target name="c.configure.solaris32" if="isSolaris32Bit">
-      <echo message="Solaris" />
-      <property name="compiler.cfg.id"    value="compiler.cfg.solaris.jocl" />
+    <target name="c.configure.solaris.x86" if="isSolarisX86">
+      <echo message="SolarisX86" />
+      <property name="compiler.cfg.id"    value="compiler.cfg.solaris.jocl.x86" />
+      <property name="linker.cfg.id"      value="linker.cfg.solaris" />
+    </target>
+ 
+    <target name="c.configure.solaris.sparc" if="isSolarisSparc">
+      <echo message="SolarisSparc" />
+      <property name="compiler.cfg.id"    value="compiler.cfg.solaris.jocl.sparc" />
       <property name="linker.cfg.id"      value="linker.cfg.solaris" />
     </target>
  
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 022451f3..5d0b8189 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -80,7 +80,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Xmx256m -Djava.library.path=\
+run.jvmargs=${jvmDataModel.arg} -Xmx256m -Djava.library.path=\
     "${basedir}/${rootrel.build}/natives/jocl${path.separator}\
      ${jogl.root}/${rootrel.build}/lib${path.separator}\
      ${gluegen.root}/${rootrel.build}/obj"
diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh
index 9ae8b770..1f497cf0 100644
--- a/scripts/make.jocl.all.linux-x86.sh
+++ b/scripts/make.jocl.all.linux-x86.sh
@@ -1,7 +1,9 @@
 #! /bin/sh
 
-if [ -e ../setenv-build-jogl-x86.sh ] ; then
-    . ../setenv-build-jogl-x86.sh
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
 ant  \
diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh
index c58e1ae9..680d1454 100644
--- a/scripts/make.jocl.all.linux-x86_64.sh
+++ b/scripts/make.jocl.all.linux-x86_64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
 ant  \
diff --git a/scripts/make.jocl.all.solaris-x86.sh b/scripts/make.jocl.all.solaris-x86.sh
new file mode 100644
index 00000000..ed815144
--- /dev/null
+++ b/scripts/make.jocl.all.solaris-x86.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+ant  \
+    -Drootrel.build=build-solaris-x86_64 \
+    $* 2>&1 | tee make.jocl.all.solaris-x86_64.log
diff --git a/scripts/make.jocl.all.solaris-x86_64.sh b/scripts/make.jocl.all.solaris-x86_64.sh
index be11b91b..ed815144 100644
--- a/scripts/make.jocl.all.solaris-x86_64.sh
+++ b/scripts/make.jocl.all.solaris-x86_64.sh
@@ -2,8 +2,8 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
-    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
 ant  \