Migrating gl2/gl3/gl4 -> gldesktop. Use JOGL_GLDESKTOP_.. when using profile.jogl script

7 files changed, 72 insertions, 105 deletions

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 42162457e..025b74dd8 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -2,7 +2,7 @@
 
 function print_usage()
 {
-    echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|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]"
+    echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GL2ES12_MIN|JOGL_GL2ES12_MAX|JOGL_GLDESKTOP_MIN|JOGL_GLDESKTOP_MAX} [jogl-build-dir]"
 }
 
 function concat_jogl_list()
@@ -32,7 +32,7 @@ JOGL_CORE="nativewindow.core.jar nativewindow.os.$OSS.jar jogl.core.jar jogl.os.
 
 JOGL_TEST="jogl.test.jar"
 
-JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.gl3.jar jogl.gl3.dbg.jar jogl.gl4.jar jogl.gl4.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
+JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.util.gldesktop.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
 JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT"
 JOGL_LIB_ALL="libjogl_desktop.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
 
@@ -51,13 +51,13 @@ JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.db
 JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar"
-JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
-JOGL_LIB_GL2_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_LIB_GL2_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_JAR_GLDESKTOP_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar"
+JOGL_JAR_GLDESKTOP_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar $JOGL_AWT jogl.cg.jar"
+JOGL_LIB_GLDESKTOP_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GLDESKTOP_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
 
-export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX
-export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX
+export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GLDESKTOP_MIN JOGL_JAR_GLDESKTOP_MAX
+export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GLDESKTOP_MIN JOGL_LIB_GLDESKTOP_MAX
 
 THISDIR=`dirname $0`
 
@@ -125,11 +125,11 @@ if [ ! -z "$JOGL_PROFILE" ] ; then
         JOGL_GL2ES12_MAX)
             JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2ES12_MAX)
             ;;
-        JOGL_GL2_MIN)
-            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2_MIN)
+        JOGL_GLDESKTOP_MIN)
+            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MIN)
             ;;
-        JOGL_GL2_MAX)
-            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GL2_MAX)
+        JOGL_GLDESKTOP_MAX)
+            JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MAX)
             ;;
     esac
 
diff --git a/make/build-common.xml b/make/build-common.xml
index ccbf56fd6..cc40a5cd4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -4,6 +4,14 @@
 
     <description>Common JOGL Stuff</description>
 
+    <fail message="Please build using Ant 1.8.0 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.8.0"/>
+            </not>
+        </condition>
+    </fail>
+
     <!-- Pull in GlueGen cpptasks build file -->
     <property name="gluegen.root" value="../../gluegen" />
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
@@ -254,7 +262,7 @@
         <property name="jogl.egl.jar"                   value="${build.jogl}/jogl.egl.jar" />
         <property name="jogl.glutess.jar"               value="${build.jogl}/jogl.glu.tess.jar" />
         <property name="jogl.glumipmap.jar"             value="${build.jogl}/jogl.glu.mipmap.jar" />
-        <property name="jogl.glugl2.jar"                value="${build.jogl}/jogl.glu.gl2.jar" />
+        <property name="jogl.glugldesktop.jar"                value="${build.jogl}/jogl.glu.gldesktop.jar" />
 
         <property name="jogl.os.x11.jar"                value="${build.jogl}/jogl.os.x11.jar" />
         <property name="jogl.os.win.jar"                value="${build.jogl}/jogl.os.win.jar" />
@@ -262,20 +270,14 @@
 
         <property name="jogl.gl2es12.jar"               value="${build.jogl}/jogl.gl2es12.jar" />
 
-        <property name="jogl.gl2.jar"                   value="${build.jogl}/jogl.gl2.jar" />
-        <property name="jogl.gl2.dbg.jar"               value="${build.jogl}/jogl.gl2.dbg.jar" />
-
-        <property name="jogl.gl3.jar"                   value="${build.jogl}/jogl.gl3.jar" />
-        <property name="jogl.gl3.dbg.jar"               value="${build.jogl}/jogl.gl3.dbg.jar" />
-
-        <property name="jogl.gl4.jar"                   value="${build.jogl}/jogl.gl4.jar" />
-        <property name="jogl.gl4.dbg.jar"               value="${build.jogl}/jogl.gl4.dbg.jar" />
+        <property name="jogl.gldesktop.jar"             value="${build.jogl}/jogl.gldesktop.jar" />
+        <property name="jogl.gldesktop.dbg.jar"         value="${build.jogl}/jogl.gldesktop.dbg.jar" />
 
         <property name="jogl.omx.jar"                   value="${build.jogl}/jogl.omx.jar" />
 
         <property name="jogl.awt.jar"                   value="${build.jogl}/jogl.awt.jar" />
         <property name="jogl.util.jar"                  value="${build.jogl}/jogl.util.jar" />
-        <property name="jogl.util.gl2.jar"              value="${build.jogl}/jogl.util.gl2.jar" />
+        <property name="jogl.util.gldesktop.jar"              value="${build.jogl}/jogl.util.gldesktop.jar" />
         <property name="jogl.util.awt.jar"              value="${build.jogl}/jogl.util.awt.jar" />
         <property name="jogl.util.fixedfuncemu.jar"     value="${build.jogl}/jogl.util.fixedfuncemu.jar" />
         <property name="jogl.sdk.jar"                   value="${build.jogl}/jogl.sdk.jar" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 6d95ebea8..1db63812e 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -86,7 +86,7 @@
         <property name="java.part.glumipmap"
                   value="com/jogamp/opengl/impl/glu/mipmap/**"/>
 
-        <property name="java.part.glugl2"
+        <property name="java.part.glugldesktop"
                   value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.openmax"
@@ -104,23 +104,11 @@
         <property name="java.part.cgl"
                   value="com/jogamp/opengl/impl/macosx/cgl/*"/>
 
-        <property name="java.part.gl4"
-                  value="com/jogamp/opengl/impl/**/gl4/**"/>
+        <property name="java.part.gldesktop"
+                  value="com/jogamp/opengl/impl/**/gl2/** com/jogamp/opengl/impl/**/gl3/** com/jogamp/opengl/impl/**/gl4/**"/>
 
-        <property name="java.part.gl4.dbg"
-                  value="javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
-
-        <property name="java.part.gl3"
-                  value="com/jogamp/opengl/impl/**/gl3/**"/>
-
-        <property name="java.part.gl3.dbg"
-                  value="javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.*"/>
-
-        <property name="java.part.gl2"
-                  value="com/jogamp/opengl/impl/**/gl2/**"/>
-
-        <property name="java.part.gl2.dbg"
-                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.*"/>
+        <property name="java.part.gldesktop.dbg"
+                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
 
         <property name="java.part.es1"
                   value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/**"/>
@@ -143,7 +131,7 @@
         <property name="java.part.util.awt"
                   value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
 
-        <property name="java.part.util.gl2"
+        <property name="java.part.util.gldesktop"
                   value="com/jogamp/opengl/util/**/gl2/**"/>
 
         <property name="java.part.util.glsl"
@@ -176,7 +164,7 @@
                   value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
 
         <property name="java.excludes.cdcfp"
-                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
+                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gldesktop} ${java.part.gldesktop.dbg} ${java.part.awt} ${java.part.glugldesktop} ${java.part.util.awt} ${java.part.util.gldesktop} com/jogamp/opengl/util/TGAWriter.java"/>
 
         <condition property="java.excludes.desktop"
                    value="${java.part.glx} ${java.excludes.cdcfp}">
@@ -225,7 +213,7 @@
         <!-- The GL headers from which Java files are generated -->
         <property name="stub.includes.opengl"       value="${stub.includes}/opengl" />
 
-        <dirset id="stub.includes.fileset.all.gl2" dir=".">
+        <dirset id="stub.includes.fileset.all.gldesktop" dir=".">
             <include name="${stub.includes}/opengl/**" />
             <include name="${stub.includes}/macosx/**" />
             <include name="${stub.includes}/win32/**" />
@@ -420,7 +408,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -432,7 +420,7 @@
         <gluegen src="${stub.includes.opengl}/gles1.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es1.cfg" 
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -444,7 +432,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c"
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es2.cfg" 
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -456,14 +444,14 @@
         <gluegen src="${stub.includes.opengl}/gl3.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3-set.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
         <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -475,7 +463,7 @@
         <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -487,7 +475,7 @@
         <gluegen src="${stub.includes.opengl}/gl3.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -499,7 +487,7 @@
         <gluegen src="${stub.includes.opengl}/gl3bc.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl3bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -511,7 +499,7 @@
         <gluegen src="${stub.includes.opengl}/gl4.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -523,7 +511,7 @@
         <gluegen src="${stub.includes.opengl}/gl4bc.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4bc.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -535,7 +523,7 @@
         <gluegen src="${stub.includes.opengl}/gles1.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -547,7 +535,7 @@
         <gluegen src="${stub.includes.opengl}/gles2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -559,7 +547,7 @@
         <echo message="Generating GL interface and implementation" />
         <gluegen src="${gl.c}" 
                  config="${gl.cfg.nsig}"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.nativesig.NativeSignatureEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -571,7 +559,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-base.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -583,7 +571,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2es1.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -595,7 +583,7 @@
         <gluegen src="${stub.includes.opengl}/glu.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2.cfg"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -607,7 +595,7 @@
         <gluegen src="${glext.platform.header}" 
                  outputRootDir="${build.jogl}"
                  config="${glext.platform.cfg}"
-                 includeRefid="stub.includes.fileset.all.gl2"
+                 includeRefid="stub.includes.fileset.all.gldesktop"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
@@ -990,7 +978,7 @@
         <copy todir="${src.generated.java-cdc}">
             <fileset dir="${src.generated.java}"
                      includes="**" 
-                     excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
+                     excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/gl4/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
         </copy>
         <copy todir="${classes-cdc}">
             <fileset dir="${classes}"
@@ -1433,7 +1421,7 @@
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es1" />
       <msvc.manifest objdir="${obj.jogl}" dllname="jogl_es2" />
-      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_gl2" />
+      <msvc.manifest objdir="${obj.jogl}" dllname="jogl_desktop" />
       <antcall target="c.manifest.cg" inheritRefs="true" />
     </target>
 
@@ -1657,7 +1645,7 @@
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
                      includes="${java.part.util} ${java.part.util.glsl}"
-                     excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
+                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
         </jar>
         <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true">
             <fileset dir="${classes-cdc}"
@@ -1668,47 +1656,25 @@
     </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
-        <!--os specific gl2-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl2}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
-        </jar>
-
-        <!--os specific gl3-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
+        <!--os specific gldesktop-->
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.gl3}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
-        </jar>
-
-        <!--os specific gl4-->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl4}, ${java.part.openmax}"
-                     excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
+                     includes="${java.part.gldesktop}, ${java.part.openmax}"
+                     excludes="${java.part.gldesktop.dbg}, ${java.part.glugldesktop}"/>
         </jar>
 
         <!-- misc -->
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl2.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.gl3.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.gldesktop.dbg.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.gl4.dbg}"/>
+                     includes="${java.part.gldesktop.dbg}"/>
         </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.glugldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glugl2}"/>
+                     includes="${java.part.glugldesktop}"/>
         </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.util.gl2}"
+                     includes="${java.part.util.gldesktop}"
                      excludes="com/jogamp/opengl/**/awt/**"/>
         </jar>
     </target>
@@ -1734,7 +1700,7 @@
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util} ${java.part.util.glsl}"
-                     excludes="${java.part.util.awt} ${java.part.util.gl2} ${java.part.util.fixedfuncemu}"/>
+                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
         </jar>
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
             <fileset dir="${classes}"
diff --git a/make/java-run-newt.sh b/make/java-run-newt.sh
index cb256e273..384cf24c8 100755
--- a/make/java-run-newt.sh
+++ b/make/java-run-newt.sh
@@ -7,7 +7,7 @@ function print_usage() {
 if [ -z "$1" ] ; then
     echo JOGL BUILD DIR missing
     print_usage
-    return
+    exit
 fi
 
 . ./setenv-jogl.sh $1
@@ -21,7 +21,7 @@ if [ $MOSX -eq 1 ] ; then
 fi
 
 # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
-# D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState"
+D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState"
 # D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true"
 # D_ARGS="-Dnativewindow.debug.X11Util=true"
 
diff --git a/make/java-run.sh b/make/java-run.sh
index 63fb6d3e9..5e48cef3a 100755
--- a/make/java-run.sh
+++ b/make/java-run.sh
@@ -7,7 +7,7 @@ function print_usage() {
 if [ -z "$1" ] ; then
     echo JOGL BUILD DIR missing
     print_usage
-    return
+    exit
 fi
 
 . ./setenv-jogl.sh $1
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 80fbe2566..7691bfa2d 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -51,11 +51,11 @@ function listdeployment() {
     echo
 
     echo JOGL GL2 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
     echo
 
     echo JOGL GL2 AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
+    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
     echo
 
     echo JOGL ALL AWT
@@ -125,8 +125,8 @@ mkdir -p nope
 
 mv *.cdc.lst *.all*.lst nope/
 
-mv jogl.gl2.*.lst nope/
-echo duplicates - w/o gl2.*
+mv jogl.gldesktop.*.lst nope/
+echo duplicates - w/o gldesktop.*
 echo
 sort jogl*.lst | uniq -d
 mv nope/* .
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 9b5c420c9..75237a210 100755
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -367,14 +367,13 @@ static uintptr_t getPtrOut32Long(unsigned long * src) {
 }
 
 static void setJavaWindowProperty(JNIEnv *env, Display *dpy, Window window, jlong javaObjectAtom, jobject jwindow) {
-    unsigned long jogl_java_object_data[2]; // FIXME uint32_t ?
+    unsigned long jogl_java_object_data[2]; // X11 is based on 'unsigned long'
     int nitems_32 = putPtrIn32Long( jogl_java_object_data, (uintptr_t) jwindow);
 
     {
         jobject test = (jobject) getPtrOut32Long(jogl_java_object_data);
         if( ! (jwindow==test) ) {
-            _throwNewRuntimeException(dpy, env, "Internal Error .. Encoded Window ref not the same %p != %p !", jwindow, test);
-            return;
+            _FatalError(env, "Internal Error .. Encoded Window ref not the same %p != %p !", jwindow, test);
         }
     }