Bug 757 (URL / URI conversion for file scheme, encoded path): Make certain core scripts capable of allowing a SPACE character.new_gl_headers

3 files changed, 49 insertions, 49 deletions

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 413c0538d..16b3a3db0 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -7,15 +7,15 @@ function print_usage()
 
 function concat_jogl_list()
 {
-    ITEMDIR=$1
+    ITEMDIR="$1"
     shift
-    for j in $ITEMDIR $ITEMDIR/jar ; do
+    for j in "$ITEMDIR" "$ITEMDIR"/jar ; do
         for i in $* ; do
-            if [ -e $j/$i ] ; then 
+            if [ -e "$j"/$i ] ; then 
                 if [ -z "$JOGL_LIST" ] ; then
-                    JOGL_LIST=$j/$i
+                    JOGL_LIST="$j"/$i
                 else
-                    JOGL_LIST=$JOGL_LIST:$j/$i
+                    JOGL_LIST="$JOGL_LIST":"$j"/$i
                 fi
             fi
         done
@@ -68,23 +68,23 @@ AUTOBUILD=0
 
 if [ ! -z "$JOGL_BUILD_DIR" -a -e "$JOGL_BUILD_DIR" ] ; then
     AUTOBUILD=0
-elif [ -e $THISDIR/jar ] ; then
+elif [ -e "$THISDIR"/jar ] ; then
     # Autobuild
-    JOGL_BUILD_DIR=$THISDIR/jar
+    JOGL_BUILD_DIR="$THISDIR"/jar
     AUTOBUILD=1
 else
-    echo invalid JOGL_BUILD_DIR $JOGL_BUILD_DIR and no AUTOBUILD
+    echo invalid JOGL_BUILD_DIR "$JOGL_BUILD_DIR" and no AUTOBUILD
     print_usage
 fi 
 export JOGL_BUILD_DIR
 
-JOGL_LIB_DIR=$JOGL_BUILD_DIR/lib
+JOGL_LIB_DIR="$JOGL_BUILD_DIR"/lib
 export JOGL_LIB_DIR
 
-JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST)
-JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT $JOGL_TEST)
-JOGL_MOBILE_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE $JOGL_TEST)
-JOGL_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT $JOGL_TEST)
+JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL $JOGL_TEST)
+JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL_NOAWT $JOGL_TEST)
+JOGL_MOBILE_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL_MOBILE $JOGL_TEST)
+JOGL_SWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_SWT $JOGL_TEST)
 export JOGL_ALL_AWT_CLASSPATH JOGL_ALL_NOAWT_CLASSPATH JOGL_MOBILE_CLASSPATH JOGL_SWT_CLASSPATH
 
 if [ ! -z "$JOGL_PROFILE" ] ; then
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index b6df348dc..5e4bb5707 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -14,7 +14,7 @@ if [ -e /opt-share/etc/profile.ant ] ; then
     . /opt-share/etc/profile.ant
 fi
 
-JOGL_BUILDDIR=$1
+JOGL_BUILDDIR="$1"
 shift
 
 if [ -z "$1" ] ; then
@@ -27,10 +27,10 @@ fi
 THISDIR=`pwd`
 
 if [ -e "$JOGL_BUILDDIR" ] ; then
-    JOGL_DIR=$JOGL_BUILDDIR/..
-    JOGL_BUILDDIR_BASE=`basename $JOGL_BUILDDIR`
+    JOGL_DIR="$JOGL_BUILDDIR/.."
+    JOGL_BUILDDIR_BASE=`basename "$JOGL_BUILDDIR"`
 else
-    echo JOGL_BUILDDIR $JOGL_BUILDDIR not exist or not given
+    echo JOGL_BUILDDIR "$JOGL_BUILDDIR" not exist or not given
     print_usage
     exit
 fi
@@ -46,15 +46,15 @@ if [ -z "$gpf" ] ; then
 fi
 
 GLUEGEN_DIR=`dirname $gpf`/..
-GLUEGEN_BUILDDIR=$GLUEGEN_DIR/$JOGL_BUILDDIR_BASE
+GLUEGEN_BUILDDIR="$GLUEGEN_DIR"/"$JOGL_BUILDDIR_BASE"
 if [ ! -e "$GLUEGEN_BUILDDIR" ] ; then
-    echo GLUEGEN_BUILDDIR $GLUEGEN_BUILDDIR does not exist
+    echo GLUEGEN_BUILDDIR "$GLUEGEN_BUILDDIR" does not exist
     print_usage
     exit
 fi
-GLUEGEN_JAR=$GLUEGEN_BUILDDIR/gluegen-rt.jar
-GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj
-JUNIT_JAR=$GLUEGEN_DIR/make/lib/junit.jar
+GLUEGEN_JAR="$GLUEGEN_BUILDDIR"/gluegen-rt.jar
+GLUEGEN_OS="$GLUEGEN_BUILDDIR"/obj
+JUNIT_JAR="$GLUEGEN_DIR"/make/lib/junit.jar
 
 joalpf=`find ../../joal -name joal.iml`
 if [ -z "$joalpf" ] ; then
@@ -67,13 +67,13 @@ if [ -z "$joalpf" ] ; then
 fi
 
 JOAL_DIR=`dirname $joalpf`
-JOAL_BUILDDIR=$JOAL_DIR/$JOGL_BUILDDIR_BASE
+JOAL_BUILDDIR="$JOAL_DIR"/"$JOGL_BUILDDIR_BASE"
 if [ ! -e "$JOAL_BUILDDIR" ] ; then
-    echo JOAL_BUILDDIR $JOAL_BUILDDIR does not exist
+    echo JOAL_BUILDDIR "$JOAL_BUILDDIR" does not exist
     print_usage
     exit
 fi
-JOAL_JAR=$JOAL_BUILDDIR/joal.jar
+JOAL_JAR="$JOAL_BUILDDIR"/joal.jar
 
 if [ -z "$ANT_PATH" ] ; then
     ANT_PATH=$(dirname $(dirname $(which ant)))
@@ -89,37 +89,37 @@ if [ -z "$ANT_PATH" ] ; then
 fi
 ANT_JARS=$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar
 
-echo GLUEGEN BUILDDIR: $GLUEGEN_BUILDDIR
-echo JOAL BUILDDIR: $JOAL_BUILDDIR
-echo JOGL DIR: $JOGL_DIR
-echo JOGL BUILDDIR: $JOGL_BUILDDIR
-echo JOGL BUILDDIR BASE: $JOGL_BUILDDIR_BASE
-echo JOGL PROFILE: $JOGL_PROFILE
+echo GLUEGEN BUILDDIR: "$GLUEGEN_BUILDDIR"
+echo JOAL BUILDDIR: "$JOAL_BUILDDIR"
+echo JOGL DIR: "$JOGL_DIR"
+echo JOGL BUILDDIR: "$JOGL_BUILDDIR"
+echo JOGL BUILDDIR BASE: "$JOGL_BUILDDIR_BASE"
+echo JOGL PROFILE: "$JOGL_PROFILE"
 
 J2RE_HOME=$(dirname $(dirname $(which java)))
 JAVA_HOME=$(dirname $(dirname $(which javac)))
 CP_SEP=:
 
-. $JOGL_DIR/etc/profile.jogl $JOGL_PROFILE $JOGL_BUILDDIR 
+. "$JOGL_DIR"/etc/profile.jogl $JOGL_PROFILE "$JOGL_BUILDDIR"
 
 LIB=$THISDIR/lib
 
-JOGAMP_ALL_AWT_CLASSPATH=.:$GLUEGEN_JAR:$JOAL_JAR:$JOGL_ALL_AWT_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
-JOGAMP_ALL_NOAWT_CLASSPATH=.:$GLUEGEN_JAR:$JOAL_JAR:$JOGL_ALL_NOAWT_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
-JOGAMP_MOBILE_CLASSPATH=.:$GLUEGEN_JAR:$JOAL_JAR:$JOGL_MOBILE_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
+JOGAMP_ALL_AWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_AWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS"
+JOGAMP_ALL_NOAWT_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_ALL_NOAWT_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS"
+JOGAMP_MOBILE_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_MOBILE_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS"
 export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPATH
 
-CLASSPATH=.:$GLUEGEN_JAR:$JOAL_JAR:$JOGL_CLASSPATH:$SWT_CLASSPATH:$JUNIT_JAR:$ANT_JARS
+CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS"
 export CLASSPATH
 
 # We use TempJarCache per default now!
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
+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 JOGAMP_ALL_AWT_CLASSPATH: $CLASSPATH
-echo JOGAMP_ALL_NOAWT_CLASSPATH: $CLASSPATH
-echo JOGAMP_MOBILE_CLASSPATH: $CLASSPATH
-echo CLASSPATH: $CLASSPATH
+echo JOGAMP_ALL_AWT_CLASSPATH: "$JOGAMP_ALL_AWT_CLASSPATH"
+echo JOGAMP_ALL_NOAWT_CLASSPATH: "$JOGAMP_ALL_NOAWT_CLASSPATH"
+echo JOGAMP_MOBILE_CLASSPATH: "$JOGAMP_MOBILE_CLASSPATH"
+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.jogamp.newt.util.MainThread" for running demos with NEWT
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 33270edc6..9caddac38 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -9,15 +9,15 @@ javaexe="$1"
 shift
 javaxargs=$1
 shift
-bdir=$1
+bdir="$1"
 shift
 
 if [ ! -x "$javaexe" ] ; then
     echo java-exe "$javaexe" is not an executable
     exit 1
 fi
-if [ ! -d $bdir ] ; then
-    echo build-dir $bdir is not a directory
+if [ ! -d "$bdir" ] ; then
+    echo build-dir "$bdir" is not a directory
     exit 1
 fi
 
@@ -25,7 +25,7 @@ rm -f java-run.log
 
 spath=`dirname $0`
 
-. $spath/setenv-jogl.sh $bdir JOGL_ALL
+. $spath/setenv-jogl.sh "$bdir" JOGL_ALL
 unset CLASSPATH
 
 MOSX=0
@@ -193,7 +193,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
-    #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
+    D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.gluegen.UseTempJarCache=false"
     #D_ARGS="-Dnewt.test.EDTMainThread -Dnewt.debug.MainThread"
     #C_ARG="com.jogamp.newt.util.MainThread"
@@ -305,7 +305,7 @@ function testawtswt() {
 #
 # av demos
 #
-testnoawt jogamp.opengl.openal.av.ALDummyUsage $*
+#testnoawt jogamp.opengl.openal.av.ALDummyUsage $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
 
@@ -315,7 +315,7 @@ testnoawt jogamp.opengl.openal.av.ALDummyUsage $*
 #testnoawt com.jogamp.nativewindow.NativeWindowVersion $*
 #testnoawt com.jogamp.opengl.JoglVersion $*
 #testnoawt com.jogamp.newt.NewtVersion $*
-#testnoawt com.jogamp.newt.opengl.GLWindow $*
+testnoawt com.jogamp.newt.opengl.GLWindow $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix02NOUI $*