Sync with jogl r2009 ; Unified setenv-jogl.sh, which works from the autobuild directory as well ; Unified java*.sh scripts

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@358 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

16 files changed, 173 insertions, 184 deletions

diff --git a/java-dbg-newt.sh b/java-dbg-newt.sh
new file mode 100755
index 0000000..99be648
--- /dev/null
+++ b/java-dbg-newt.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+MOSX=0
+uname -a | grep -i Darwin && MOSX=1
+
+CPOK=0
+echo $CLASSPATH | grep jogl && CPOK=1
+
+if [ $CPOK -eq 0 ] ; then
+    # Only valid for autobuild .. otherwise run manually with build-dir
+    . ./setenv-jogl.sh JOGL_ALL
+    echo $CLASSPATH | grep jogl && CPOK=1
+fi
+if [ $CPOK -eq 0 ] ; then
+    echo No JOGL in CLASSPATH
+else
+    # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
+    D_ARGS="-Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
+    if [ $MOSX -eq 1 ] ; then
+        X_ARGS="-XstartOnFirstThread"
+    fi
+
+    java $X_ARGS -Djava.awt.headless=true $D_ARGS com.sun.javafx.newt.util.MainThread $* 2>&1 | tee java-dbg-newt.log
+fi
diff --git a/java-dbg.sh b/java-dbg.sh
index fd88bcd..455b8b6 100644
--- a/java-dbg.sh
+++ b/java-dbg.sh
@@ -1,7 +1,18 @@
 #! /bin/sh
 
-# java -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
-java -Dnewt.debug=all -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
-# java -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+CPOK=0
+echo $CLASSPATH | grep jogl && CPOK=1
 
+if [ $CPOK -eq 0 ] ; then
+    # Only valid for autobuild .. otherwise run manually with build-dir
+    . ./setenv-jogl.sh JOGL_ALL
+    echo $CLASSPATH | grep jogl && CPOK=1
+fi
+if [ $CPOK -eq 0 ] ; then
+    echo No JOGL in CLASSPATH
+else
+    # java -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+    java -Dnewt.debug=all -Dnativewindow.debug=all -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+    # java -Djogl.debug=all $* 2>&1 | tee java-dbg.log
+fi
 
diff --git a/java-macosx-mainthread.sh b/java-macosx-mainthread.sh
deleted file mode 100755
index 706b030..0000000
--- a/java-macosx-mainthread.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all
-# -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all
-
-java -XstartOnFirstThread -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread $* 2>&1 | tee java-macosx.mainThread.log
diff --git a/java-macosx.sh b/java-macosx.sh
deleted file mode 100755
index 71f5549..0000000
--- a/java-macosx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# -Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all
-# -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all
-
-java -XstartOnFirstThread -Djava.awt.headless=true $* 2>&1 | tee java-macosx.log
diff --git a/java-run-newt.sh b/java-run-newt.sh
new file mode 100755
index 0000000..b2a5674
--- /dev/null
+++ b/java-run-newt.sh
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+MOSX=0
+uname -a | grep -i Darwin && MOSX=1
+
+CPOK=0
+echo $CLASSPATH | grep jogl && CPOK=1
+
+if [ $CPOK -eq 0 ] ; then
+    # Only valid for autobuild .. otherwise run manually with build-dir
+    . ./setenv-jogl.sh JOGL_ALL
+    echo $CLASSPATH | grep jogl && CPOK=1
+fi
+if [ $CPOK -eq 0 ] ; then
+    echo No JOGL in CLASSPATH
+else
+    if [ $MOSX -eq 1 ] ; then
+        X_ARGS="-XstartOnFirstThread"
+    fi
+
+    java $X_ARGS -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
+fi
diff --git a/java-run.sh b/java-run.sh
new file mode 100644
index 0000000..9108f2e
--- /dev/null
+++ b/java-run.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+CPOK=0
+echo $CLASSPATH | grep jogl && CPOK=1
+
+if [ $CPOK -eq 0 ] ; then
+    # Only valid for autobuild .. otherwise run manually with build-dir
+    . ./setenv-jogl.sh JOGL_ALL
+    echo $CLASSPATH | grep jogl && CPOK=1
+fi
+if [ $CPOK -eq 0 ] ; then
+    echo No JOGL in CLASSPATH
+else
+    java $* 2>&1 | tee java-run.log
+fi
+
diff --git a/java-win32-dbg.bat b/java-win32-dbg.bat
index dc9c8d2..9b0dc4e 100644
--- a/java-win32-dbg.bat
+++ b/java-win32-dbg.bat
@@ -1,11 +1,17 @@
 
-REM set TOPDIR=C:\SUN\JOGL2
 set TOPDIR=..
 set J2RE_HOME=c:\jre6
 set JAVA_HOME=c:\jdk6
 
+IF NOT EXIST %TOPDIR%\lib-jogl-jars GOTO DIRSET2
 set JAR_DIR=%TOPDIR%\lib-jogl-jars
 set LIB_DIR=%TOPDIR%\lib-jogl-win32
+GOTO DIRSETFIN
+:DIRSET2
+set JAR_DIR=jogl\lib
+set LIB_DIR=jogl\lib
+:DIRSETFIN
+
 
 set PATH=%J2RE_HOME%\bin;%LIB_DIR%;%PATH%
 set CLASSPATH=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;%JAR_DIR%\jogl-demos.jar;%JAR_DIR%\jogl-demos-util.jar;%JAR_DIR%\jogl-demos-data.jar
@@ -14,8 +20,6 @@ echo CLASSPATH %CLASSPATH%
 
 echo PATH %PATH%
 
-REM java "-Dgluegen.debug.ProcAddressHelper" "-Dgluegen.debug.NativeLibrary=true" "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" %1 %2 %3 %4 > java-win32-dbg.log 2>&1
-REM java "-Dgluegen.debug.NativeLibrary=true" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1
-java "-Dnewt.debug.Window" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1
+java "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32.log 2>&1
 
 
diff --git a/java-win32.bat b/java-win32.bat
index e9ed420..b27da06 100644
--- a/java-win32.bat
+++ b/java-win32.bat
@@ -1,11 +1,16 @@
 
-#set TOPDIR=C:\SUN\JOGL2
 set TOPDIR=..
 set J2RE_HOME=c:\jre6
 set JAVA_HOME=c:\jdk6
 
+IF NOT EXIST %TOPDIR%\lib-jogl-jars GOTO DIRSET2
 set JAR_DIR=%TOPDIR%\lib-jogl-jars
 set LIB_DIR=%TOPDIR%\lib-jogl-win32
+GOTO DIRSETFIN
+:DIRSET2
+set JAR_DIR=jogl\lib
+set LIB_DIR=jogl\lib
+:DIRSETFIN
 
 set PATH=%J2RE_HOME%\bin;%LIB_DIR%;%PATH%
 set CLASSPATH=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;%JAR_DIR%\jogl-demos.jar;%JAR_DIR%\jogl-demos-util.jar;%JAR_DIR%\jogl-demos-data.jar
diff --git a/make/build.xml b/make/build.xml
index f5cd571..bc94d58 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -56,6 +56,9 @@
 
     <target name="init" depends="java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes">
         <property name="jogl.core.jar"       value="../../jogl/${rootrel.build}/jogl/jogl.core.jar" />
+        <condition property="jogl.cg.jar"    value="../../jogl/${rootrel.build}/jogl/jogl.cg.jar">
+          <isset property="jogl.cg"/>
+        </condition>
         <property name="jogl.gles12.jar"     value="../../jogl/${rootrel.build}/jogl/jogl.gles12.jar" />
         <property name="jogl.gles12.dbg.jar" value="../../jogl/${rootrel.build}/jogl/jogl.gles12.dbg.jar" />
         <property name="jogl.gles1.jar"      value="../../jogl/${rootrel.build}/jogl/jogl.gles1.jar" />
@@ -113,6 +116,7 @@
             <pathelement location="${nativewindow.x11.jar}" />
             <pathelement location="${nativewindow.awt.jar}" />
             <pathelement location="${jogl.core.jar}" />
+            <pathelement location="${jogl.cg.jar}" />
             <pathelement location="${jogl.gles1.jar}" />
             <pathelement location="${jogl.gles1.dbg.jar}" />
             <pathelement location="${jogl.gles2.jar}" />
diff --git a/make/make.jogl.all.macosx.sh b/make/make.jogl.all.macosx.sh
index e7a5ee3..02f8ccc 100644
--- a/make/make.jogl.all.macosx.sh
+++ b/make/make.jogl.all.macosx.sh
@@ -5,5 +5,6 @@
 #    -Dc.compiler.debug=true 
 
 ant -v \
+    -Djogl.cg=1 \
     -Drootrel.build=build-macosx \
     $* 2>&1 | tee make.jogl.all.macosx.log
diff --git a/make/make.jogl.all.x86.sh b/make/make.jogl.all.x86.sh
index 89745c9..cfd4709 100644
--- a/make/make.jogl.all.x86.sh
+++ b/make/make.jogl.all.x86.sh
@@ -5,5 +5,6 @@
 #    -Dc.compiler.debug=true 
 
 ant \
+    -Djogl.cg=1 \
     -Drootrel.build=build-x86 \
     $* 2>&1 | tee make.jogl.all.x86.log
diff --git a/make/make.jogl.all.x86_64.sh b/make/make.jogl.all.x86_64.sh
index 6d96b9c..1fa1675 100644
--- a/make/make.jogl.all.x86_64.sh
+++ b/make/make.jogl.all.x86_64.sh
@@ -3,7 +3,9 @@
 . ../../setenv-build-jogl-x86_64.sh
 
 #    -Dc.compiler.debug=true 
+#    -Djogl.cg=1 \
 
 ant \
+    -Djogl.cg=1 \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.jogl.all.x86_64.log
diff --git a/setenv-jogl.macosx.sh b/setenv-jogl.macosx.sh
deleted file mode 100644
index a2b49e1..0000000
--- a/setenv-jogl.macosx.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-if [ -z "$1" ] ; then
-    echo "Usage: $0 {JOGL_ALL|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX}"
-else
-
-JOGL_PROFILE=$1
-shift
-
-echo JOGL PROFILE: $JOGL_PROFILE
-
-CVSROOT=":pserver:[email protected]:/cvs"
-THISDIR=`pwd`
-export CVSROOT THISDIR
-
-if [ -x /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
-fi
-
-J2RE_HOME=$(which java)
-JAVA_HOME=$(which javac)
-CP_SEP=:
-
-export LIBXCB_ALLOW_SLOPPY_LOCK=1
-
-. $THISDIR/../jogl/etc/profile.jogl $THISDIR/../jogl/build-macosx $JOGL_PROFILE
-
-GLUEGEN_JAR=$THISDIR/../gluegen/build-macosx/gluegen-rt.jar
-GLUEGEN_OS=$THISDIR/../gluegen/build-macosx/obj
-
-LIB=$THISDIR/lib
-
-# CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:.:build-macosx/classes
-CLASSPATH=.:$THISDIR/build-macosx/jogl-demos.jar:$THISDIR/build-macosx/jogl-demos-util.jar:$THISDIR/build-macosx/jogl-demos-data.jar:$GLUEGEN_JAR:$JOGL_CLASSPATH
-for i in $LIB/*jar ; do
-    CLASSPATH=$CLASSPATH:$i
-done
-export CLASSPATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
-
-echo REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT
-echo JOGL_CLASSPATH: $JOGL_CLASSPATH
-
-PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
-export PATH
-
-fi
-
-
diff --git a/setenv-jogl.sh b/setenv-jogl.sh
index a89dd40..528c193 100644
--- a/setenv-jogl.sh
+++ b/setenv-jogl.sh
@@ -1,44 +1,100 @@
 #! /bin/sh
 
+function print_usage() {
+    echo "Usage: $0 {JOGL_ALL|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX} [jogl-build-dir]"
+}
+
 if [ -z "$1" ] ; then
-    echo "Usage: $0 {JOGL_ALL|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX}"
-else
+    echo JOGL PROFILE missing
+    print_usage
+fi
 
 JOGL_PROFILE=$1
 shift
 
-echo JOGL PROFILE: $JOGL_PROFILE
+JOGL_BUILDDIR=
+if [ ! -z "$1" ] ; then
+    JOGL_BUILDDIR=$1
+    shift
+fi
 
-CVSROOT=":pserver:[email protected]:/cvs"
 THISDIR=`pwd`
-export CVSROOT THISDIR
+AUTOBUILD=0
 
-if [ -x /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
+if [ -e "$JOGL_BUILDDIR" ] ; then
+    JOGL_DIR=$JOGL_BUILDDIR/..
+    JOGL_BUILDDIR_BASE=`basename $JOGL_BUILDDIR`
+else
+    AUTOBUILD=1
+    jpf=`find jogl/etc -name profile.jogl`
+    if [ -z "$jpf" ] ; then
+        jpf=`find . -name profile.jogl`
+    fi
+    if [ -z "$jpf" ] ; then
+        echo JOGL_DIR not found
+        echo JOGL_BUILDDIR $JOGL_BUILDDIR not exist or not given
+        print_usage
+    fi
+    JOGL_DIR=`dirname $jpf`/..
+    JOGL_BUILDDIR=$JOGL_DIR/lib
+    JOGL_BUILDDIR_BASE="."
 fi
 
-J2RE_HOME=$(dirname `which java`)
-JAVA_HOME=$(dirname `which javac`)
-CP_SEP=:
+if [ $AUTOBUILD -eq 0 ] ; then
+    gpf=`find ../gluegen/make -name dynlink-unix.cfg`
+    if [ -z "$gpf" ] ; then
+        gpf=`find .. -name dynlink-unix.cfg`
+    fi
+    if [ -z "$gpf" ] ; then
+        echo GLUEGEN_BUILDDIR not found
+        print_usage
+    fi
+    GLUEGEN_DIR=`dirname $gpf`/..
+    GLUEGEN_BUILDDIR=$GLUEGEN_DIR/$JOGL_BUILDDIR_BASE
+    if [ -e "$GLUEGEN_BUILDDIR" ] ; then
+        echo GLUEGEN_BUILDDIR $GLUEGEN_BUILDDIR does not exist
+        print_usage
+    fi
+    GLUEGEN_JAR=$GLUEGEN_BUILDDIR/gluegen-rt.jar
+    GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj
+else
+    GLUEGEN_BUILDDIR=$JOGL_BUILDDIR
+    GLUEGEN_JAR=$JOGL_BUILDDIR/gluegen-rt.jar
+    GLUEGEN_OS=$JOGL_BUILDDIR
+fi
 
-export LIBXCB_ALLOW_SLOPPY_LOCK=1
+DEMOS_BUILDDIR=$THISDIR/$JOGL_BUILDDIR_BASE
 
-. $THISDIR/../jogl/etc/profile.jogl $THISDIR/../jogl/build $THISDIR/../jogl/build/obj $JOGL_PROFILE
+echo JOGL AUTOBUILD: $AUTOBUILD
+echo GLUEGEN BUILDDIR: $GLUEGEN_BUILDDIR
+echo JOGL DIR: $JOGL_DIR
+echo JOGL BUILDDIR: $JOGL_BUILDDIR
+echo JOGL BUILDDIR BASE: $JOGL_BUILDDIR_BASE
+echo JOGL PROFILE: $JOGL_PROFILE
+echo DEMOS BUILDDIR: $DEMOS_BUILDDIR
 
-GLUEGEN_JAR=$THISDIR/../gluegen/build/gluegen-rt.jar
-GLUEGEN_OS=$THISDIR/../gluegen/build/obj
+J2RE_HOME=$(which java)
+JAVA_HOME=$(which javac)
+CP_SEP=:
+
+. $JOGL_DIR/etc/profile.jogl $JOGL_PROFILE $JOGL_BUILDDIR 
 
 LIB=$THISDIR/lib
 
-# CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:.:build/classes
-CLASSPATH=.:$THISDIR/build/jogl-demos.jar:$THISDIR/build/jogl-demos-util.jar:$THISDIR/build/jogl-demos-data.jar:$GLUEGEN_JAR:$JOGL_CLASSPATH
+CLASSPATH=.:$DEMOS_BUILDDIR/jogl-demos.jar:$DEMOS_BUILDDIR/jogl-demos-util.jar:$DEMOS_BUILDDIR/jogl-demos-data.jar:$GLUEGEN_JAR:$JOGL_CLASSPATH
 for i in $LIB/*jar ; do
     CLASSPATH=$CLASSPATH:$i
 done
 export CLASSPATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$THISDIR/../jogl/build/obj
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
 
-echo JOGL_CLASSPATH: $JOGL_CLASSPATH
-fi
+echo CLASSPATH: $CLASSPATH
+echo
+echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT
+echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread" for running demos with NEWT
+
+PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+export PATH
 
 
diff --git a/setenv-jogl.x86.sh b/setenv-jogl.x86.sh
deleted file mode 100644
index ee8fbca..0000000
--- a/setenv-jogl.x86.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-
-if [ -z "$1" ] ; then
-    echo "Usage: $0 {JOGL_ALL|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX}"
-else
-
-JOGL_PROFILE=$1
-shift
-
-echo JOGL PROFILE: $JOGL_PROFILE
-
-CVSROOT=":pserver:[email protected]:/cvs"
-THISDIR=`pwd`
-export CVSROOT THISDIR
-
-if [ -x /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
-fi
-
-J2RE_HOME=/opt-linux-x86/jre6
-JAVA_HOME=/opt-linux-x86/j2se6
-CP_SEP=:
-
-export LIBXCB_ALLOW_SLOPPY_LOCK=1
-
-. $THISDIR/../jogl/etc/profile.jogl $THISDIR/../jogl/build-x86 $JOGL_PROFILE
-
-GLUEGEN_JAR=$THISDIR/../gluegen/build-x86/gluegen-rt.jar
-GLUEGEN_OS=$THISDIR/../gluegen/build-x86/obj
-
-LIB=$THISDIR/lib
-
-# CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:.:build-x86/classes
-CLASSPATH=.:$THISDIR/build-x86/jogl-demos.jar:$THISDIR/build-x86/jogl-demos-util.jar:$THISDIR/build-x86/jogl-demos-data.jar:$GLUEGEN_JAR:$JOGL_CLASSPATH
-for i in $LIB/*jar ; do
-    CLASSPATH=$CLASSPATH:$i
-done
-export CLASSPATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
-
-echo JOGL_CLASSPATH: $JOGL_CLASSPATH
-
-PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
-export PATH
-
-fi
-
-
diff --git a/setenv-jogl.x86_64.sh b/setenv-jogl.x86_64.sh
deleted file mode 100644
index b4832f2..0000000
--- a/setenv-jogl.x86_64.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-
-if [ -z "$1" ] ; then
-    echo "Usage: $0 {JOGL_ALL|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GL2_MIN|JOGL_GL2_MAX}"
-else
-
-JOGL_PROFILE=$1
-shift
-
-echo JOGL PROFILE: $JOGL_PROFILE
-
-CVSROOT=":pserver:[email protected]:/cvs"
-THISDIR=`pwd`
-export CVSROOT THISDIR
-
-if [ -x /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
-fi
-
-J2RE_HOME=/opt-linux-x86_64/jre6
-JAVA_HOME=/opt-linux-x86_64/j2se6
-CP_SEP=:
-
-export LIBXCB_ALLOW_SLOPPY_LOCK=1
-
-. $THISDIR/../jogl/etc/profile.jogl $THISDIR/../jogl/build-x86_64 $JOGL_PROFILE
-
-GLUEGEN_JAR=$THISDIR/../gluegen/build-x86_64/gluegen-rt.jar
-GLUEGEN_OS=$THISDIR/../gluegen/build-x86_64/obj
-
-LIB=$THISDIR/lib
-
-# CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:.:build-x86_64/classes
-CLASSPATH=.:$THISDIR/build-x86_64/jogl-demos.jar:$THISDIR/build-x86_64/jogl-demos-util.jar:$THISDIR/build-x86_64/jogl-demos-data.jar:$GLUEGEN_JAR:$JOGL_CLASSPATH
-for i in $LIB/*jar ; do
-    CLASSPATH=$CLASSPATH:$i
-done
-export CLASSPATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
-
-echo JOGL_CLASSPATH: $JOGL_CLASSPATH
-
-PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
-export PATH
-
-fi
-