Add: Extended support for CVM:

        - GLX, CGL, WGL
        - GL2ES12 desktop ES1 and ES2 common profile

Cleanup JAR file seperation
    - New: jogl.cdcfp.jar (ALL for CVM/CDC)
    - New: setup.nogl2es12 (Allow GL2ES12 for CVM without gl2/gl3)
    - Clean dependencies of GLX, WGL, CGL (incl. for GL2ES12)
    - Only build supported JAR archive, ie if they are being build

Fix GL2ES12: Only add impl. for ES1 and ES2  interface methods

- Use new com.sun.gluegen.runtime.PointerBuffer, to support CVM

- CVM and J2SE Java JAR archives are equal!
    - Well, the build form *everything* includes some empty directories
      in the cdcfp JAR archives though.

- Removed last AWT dependency in MacOSX chain
    - GLDrawableFactory
        - com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory
            - com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory

1 files changed, 47 insertions, 30 deletions

diff --git a/make/build-newt.xml b/make/build-newt.xml
index da314090e..6d32b33d5 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -73,12 +73,12 @@
       -->
     <target name="base.init">
 
-        <condition property="setup.noAWT">
-           <isset property="setup.cdcfp"/> 
-        </condition>
         <condition property="isCDCFP">
            <isset property="setup.cdcfp"/>
         </condition>
+        <condition property="setup.noAWT">
+           <isset property="setup.cdcfp"/> 
+        </condition>
         <condition property="javac.bootclasspath.jar"
                    value="../../gluegen/make/lib/cdc_fp.jar">
            <isset property="setup.cdcfp"/> 
@@ -179,8 +179,10 @@
         <property name="rootrel.obj" value="${rootrel.build.newt}/obj" />
 
         <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
-        <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
-        <property name="jogl.all.jar" value="../${rootrel.build}/jogl/jogl.all.jar" />
+        <property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
+        <property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
+        <property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
+        <property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
 
         <!-- The source directories. -->
         <property name="src.java" value="${project.root}/${rootrel.src.java}" />
@@ -196,9 +198,11 @@
         <property name="obj"      value="${project.root}/${rootrel.obj}" />
 
         <path id="nativewindow_gluegen_jogl.classpath">
-            <pathelement location="${nativewindow.all.jar}" />
+            <pathelement location="${nativewindow.core.jar}" />
+            <pathelement location="${nativewindow.awt.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
-            <pathelement location="${jogl.all.jar}" />
+            <pathelement location="${jogl.core.jar}" />
+            <pathelement location="${jogl.egl.jar}" />
         </path>
 
         <!-- The resulting newt.jar. -->
@@ -206,6 +210,7 @@
         <property name="newt.ogl.jar"  value="${build}/newt.ogl.jar" />
         <property name="newt.awt.jar"  value="${build}/newt.awt.jar" />
         <property name="newt.all.jar"  value="${build}/newt.all.jar" />
+        <property name="newt.cdcfp.jar" value="${build}/newt.cdcfp.jar" />
 
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_newt_public" />
@@ -509,10 +514,10 @@
     </macrodef>  
 
     <target name="c.build.newt.prepare">
-      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/Windows" classpath="${newt.all.jar}" class="com.sun.javafx.newt.windows.WindowsWindow" />
-      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/MacOSX" classpath="${newt.all.jar}" class="com.sun.javafx.newt.macosx.MacWindow" />
-      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/X11" classpath="${newt.all.jar}" class="com.sun.javafx.newt.x11.X11Window" />
-      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/KD" classpath="${newt.all.jar}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
+      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/Windows" classpath="${newt.cdcfp.jar}" class="com.sun.javafx.newt.windows.WindowsWindow" />
+      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/MacOSX" classpath="${newt.cdcfp.jar}" class="com.sun.javafx.newt.macosx.MacWindow" />
+      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/X11" classpath="${newt.cdcfp.jar}" class="com.sun.javafx.newt.x11.X11Window" />
+      <javah destdir="../${rootrel.build.newt}/gensrc/native/newt/KD" classpath="${newt.cdcfp.jar}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
     </target>
 
     <target name="c.build.newt.windowlib">
@@ -544,17 +549,14 @@
     <target name="jar" depends="java.compile,build-jars"/>
 
     <target name="setup-manifestfile">
-      <condition property="manifestfile" value="newtRIversion">
-        <isset property="newt.ri" />
-      </condition>
-      <condition property="manifestfile" value="newtversion">
-        <not>
+        <condition property="manifestfile" value="newtRIversion">
           <isset property="newt.ri" />
-        </not>
-      </condition>
-    </target>
-
-    <target name="build-jars" depends="setup-manifestfile">
+        </condition>
+        <condition property="manifestfile" value="newtversion">
+          <not>
+            <isset property="newt.ri" />
+          </not>
+        </condition>
         <tstamp>
              <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
         </tstamp>
@@ -567,22 +569,37 @@
           </filterset>
         </copy>
 
-        <jar manifest="tempversion" destfile="${newt.core.jar}">
+    </target>
+
+    <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
+        <jar manifest="tempversion" destfile="${newt.awt.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.core}"/>
+                     includes="${java.part.awt}"/>
         </jar>
+    </target>
+
+    <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL">
         <jar manifest="tempversion" destfile="${newt.ogl.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.core}, ${java.part.opengl}"/>
+                     includes="${java.part.opengl}"/>
         </jar>
-        <jar manifest="tempversion" destfile="${newt.awt.jar}">
+    </target>
+
+    <target name="build-jars-all" depends="setup-manifestfile" unless="setup.cdcfp">
+        <jar manifest="tempversion" destfile="${newt.all.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.awt}"/>
+                     includes="com/sun/javafx/newt/**" />
         </jar>
-        <jar manifest="tempversion" destfile="${newt.all.jar}">
-            <fileset dir="${classes}">
-                <include name="com/sun/javafx/newt/**" />
-            </fileset>
+    </target>
+
+    <target name="build-jars" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all">
+        <jar manifest="tempversion" destfile="${newt.core.jar}">
+            <fileset dir="${classes}"
+                     includes="${java.part.core}"/>
+        </jar>
+        <jar manifest="tempversion" destfile="${newt.cdcfp.jar}">
+            <fileset dir="${classes}"
+                     includes="${java.part.core} ${java.part.opengl}"/>
         </jar>
 
         <delete file="tempversion"/>