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

1 files changed, 39 insertions, 73 deletions

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}"