Fix CStruct APT File Location - Threw FileNotFoundException w/ Java7

3 files changed, 78 insertions, 3 deletions

diff --git a/make/scripts/make.gluegen.all.linux-x86_64.java7.sh b/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
new file mode 100755
index 0000000..967a21e
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/setenv-build-jogl-x86_64.java7.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.java7.sh
+fi
+
+#    -Dc.compiler.debug=true 
+#    -Dgluegen.cpptasks.detected.os=true \
+#    -DisUnix=true \
+#    -DisLinux=true \
+#    -DisLinuxAMD64=true \
+#    -DisX11=true \
+#
+#    -Dtarget.sourcelevel=1.6 \
+#    -Dtarget.targetlevel=1.6 \
+#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+
+# BUILD_ARCHIVE=true \
+ant \
+    -Dc.compiler.debug=true  \
+    -Djavacdebuglevel="source,lines,vars" \
+    -Drootrel.build=build-x86_64.java7 \
+    $* 2>&1 | tee make.gluegen.all.linux-x86_64.java7.log
diff --git a/make/scripts/setenv-build-jogl-x86_64.java7.sh b/make/scripts/setenv-build-jogl-x86_64.java7.sh
new file mode 100644
index 0000000..6d293a0
--- /dev/null
+++ b/make/scripts/setenv-build-jogl-x86_64.java7.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+echo $0
+
+if [ -e /opt-share/apache-ant ] ; then
+    ANT_PATH=/opt-share/apache-ant
+    PATH=$ANT_PATH/bin:$PATH
+    export ANT_PATH
+fi
+if [ -z "$ANT_PATH" ] ; then
+    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
+        ANT_PATH=/usr/share/ant
+        export ANT_PATH
+        echo autosetting ANT_PATH to $ANT_PATH
+    fi
+fi
+if [ -z "$ANT_PATH" ] ; then
+    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
+        ANT_PATH=/usr/share/ant
+        export ANT_PATH
+        echo autosetting ANT_PATH to $ANT_PATH
+    fi
+fi
+if [ -z "$ANT_PATH" ] ; then
+    echo ANT_PATH does not exist, set it
+    exit
+fi
+
+if [ -e /opt-linux-x86_64/jre7 -a -e /opt-linux-x86_64/j2se7 ] ; then
+    J2RE_HOME=/opt-linux-x86_64/jre7
+    JAVA_HOME=/opt-linux-x86_64/j2se7
+    PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+    export J2RE_HOME JAVA_HOME
+elif [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
+    # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
+    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
+    J2RE_HOME=/usr/java/jre/bin/amd64
+    JAVA_HOME=/usr/java/bin/amd64
+    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
+    export J2RE_HOME JAVA_HOME
+elif [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then
+    # make a symbolic link: /opt-solaris-x86_64/jre6/bin/amd64/bin$ ln -s . bin
+    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
+    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
+
+
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 9c7d674..6b2a66e 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -31,9 +31,7 @@ if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then
     JAVA_HOME=/opt-linux-x86_64/j2se6
     PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
     export J2RE_HOME JAVA_HOME
-fi
-
-if [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
+elif [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
     # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
     # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
     J2RE_HOME=/usr/java/jre/bin/amd64