Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

5 files changed, 31 insertions, 22 deletions

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 1177aaa49..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
@@ -24,18 +24,25 @@ function concat_jogl_list()
 }
 
 ARCH=`uname -m`
+if [ "$ARCH" = "i86pc" ] ; then
+    ARCH="x86"
+fi
+
 KERNEL=`uname -s | awk ' { printf "%s",tolower($0) ; } '`
+if [ "$KERNEL" = "sunos" ] ; then
+    KERNEL="solaris"
+fi
 
 uname -a | grep -i LINUX && OSS=x11
 uname -a | grep -i Darwin && OSS=osx
 uname -a | grep -i CYGWIN && OSS=win
 
-JOGL_TEST="jogl.test.jar"
+JOGL_TEST="jogl-test.jar"
 
-JOGL_JAR_ALL="jogl.all.jar"
-JOGL_JAR_ALL_NOAWT="jogl.all-noawt.jar"
-JOGL_JAR_ALL_MOBILE="jogl.all-mobile.jar"
-JOGL_JAR_SWT="atomic/jogl.swt.jar"
+JOGL_JAR_ALL="jogl-all.jar"
+JOGL_JAR_ALL_NOAWT="jogl-all-noawt.jar"
+JOGL_JAR_ALL_MOBILE="jogl-all-mobile.jar"
+JOGL_JAR_SWT="atomic/jogl-swt.jar"
 
 JOGL_LIB_ALL="libnativewindow_x11.so libnativewindow_awt.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so"
 JOGL_LIB_ALL_NOAWT="libnativewindow_x11.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so"
@@ -61,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_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT)
+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
@@ -99,6 +106,8 @@ export JOGL_CLASSPATH
 
 if [ "$KERNEL" = "linux" ] ; then
     SWT_SUB="gtk"
+elif [ "$KERNEL" = "solaris" ] ; then
+    SWT_SUB="gtk"
 elif [ "$KERNEL" = "darwin" ] ; then
     SWT_SUB="cocoa"
     KERNEL="macosx"
diff --git a/etc/test.bat b/etc/test.bat
index 0c82233ca..d635c7e8f 100755
--- a/etc/test.bat
+++ b/etc/test.bat
@@ -1,7 +1,7 @@
 

 set BLD_DIR=jar

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl-all.jar

 echo CP_ALL %CP_ALL%

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

diff --git a/etc/test.sh b/etc/test.sh
index 1912a9514..714c3d8a4 100755
--- a/etc/test.sh
+++ b/etc/test.sh
@@ -12,7 +12,7 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $logfile
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $logfile
 echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a $logfile
 
-CLASSPATH=jar/gluegen-rt.jar:jar/jogl.all.jar
+CLASSPATH=jar/gluegen-rt.jar:jar/jogl-all.jar
 export CLASSPATH
 
 echo CLASSPATH: $CLASSPATH
diff --git a/etc/test_dbg.bat b/etc/test_dbg.bat
index 33bbb912b..209690758 100755
--- a/etc/test_dbg.bat
+++ b/etc/test_dbg.bat
@@ -1,7 +1,7 @@
 

 set BLD_DIR=jar

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl-all.jar

 echo CP_ALL %CP_ALL%

 

 set D_ARGS="-Djogamp.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all"

diff --git a/etc/test_dbg.sh b/etc/test_dbg.sh
index f7d0fd2b3..72b2b3fcf 100755
--- a/etc/test_dbg.sh
+++ b/etc/test_dbg.sh
@@ -12,7 +12,7 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $logfile
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $logfile
 echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a $logfile
 
-CLASSPATH=jar/gluegen-rt.jar:jar/jogl.all.jar
+CLASSPATH=jar/gluegen-rt.jar:jar/jogl-all.jar
 export CLASSPATH
 
 echo CLASSPATH: $CLASSPATH