3rd round cdcfp - compile clean.

Re-adding cdcfp:
    com/sun/opengl/impl/glu/mipmap/*
    com/sun/opengl/impl/GLPbufferImpl.java

    Using 'BufferUtil.nativeOrder(ByteBuffer)'
    to set up the native byte order.
    'BufferUtil.nativeOrder' is now public.

    GLDrawableFactory:
        - removed 'hardcoded' awt attribute.

    Cleanup NEWT's AWT wrapping implementation.
        - NativeWindowFactory incooperates with the wrapping property.

    Bugs on X11/NEWT/AWT:
        - no events
        - deadlock at shutdown
        - deadlock if EGLDrawable with AWT get's locked


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1700 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 17 insertions, 8 deletions

diff --git a/make/build.xml b/make/build.xml
index 3c62f2c36..b35641e43 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -149,7 +149,7 @@
         <!-- partitioning -->
 
         <property name="java.part.egl"
-                  value="com/sun/opengl/impl/egl/**"/>
+                  value="com/sun/opengl/impl/egl/*"/>
 
         <property name="java.part.glugl2"
                   value="com/sun/opengl/impl/glu/gl2/**, com/sun/opengl/impl/glu/nurbs/**, com/sun/opengl/impl/glu/registry/**, com/sun/opengl/impl/glu/tessellator/**, javax/media/opengl/glu/gl2/**"/>
@@ -173,7 +173,7 @@
                   value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/>
 
         <property name="java.part.awt"
-                  value="javax/media/opengl/awt/**, javax/media/opengl/util/awt/**, com/sun/opengl/impl/awt/**"/>
+                  value="javax/media/opengl/awt/**, javax/media/opengl/util/awt/**, com/sun/opengl/impl/awt/**, com/sun/opengl/impl/egl/awt/*"/>
 
         <property name="java.part.util"
                   value="com/sun/opengl/util/io/**, com/sun/opengl/util/texture/**"/>
@@ -197,7 +197,10 @@
                   value="${java.part.x11}, ${java.part.win}, ${java.part.macosx}, com/sun/opengl/impl/jawt/*"/>
 
         <property name="java.part.newt"
-                  value="com/sun/javafx/newt/**"/>
+                  value="com/sun/javafx/newt/*, com/sun/javafx/newt/x11/*, com/sun/javafx/newt/windows/*"/>
+
+        <property name="java.part.newt.awt"
+                  value="com/sun/javafx/newt/awt/*"/>
 
         <!-- condition excludes -->
 
@@ -233,7 +236,7 @@
         </condition>
 
         <condition property="java.excludes.awt"
-                   value="${java.part.awt}, ${java.part.util.awt}">
+                   value="${java.part.awt}, ${java.part.util.awt}, ${java.part.newt.awt}">
            <isset property="jogl.noAWT"/> 
         </condition>
 
@@ -258,7 +261,7 @@
         </condition>
 
         <condition property="java.excludes.newt"
-                   value="${java.part.newt}">
+                   value="${java.part.newt}, ${java.part.newt.awt}">
            <isset property="jogl.nonewt"/> 
         </condition>
 
@@ -271,7 +274,7 @@
         </condition>
 
         <condition property="java.excludes.cdcfp"
-                   value="com/sun/opengl/util/io/TGAWriter*, com/sun/opengl/impl/glu/mipmap/**, com/sun/opengl/impl/GLPbufferImpl*, com/sun/opengl/util/texture/**">
+                   value="com/sun/opengl/util/io/TGAWriter*, com/sun/opengl/util/texture/**">
            <isset property="jogl.cdcfp"/> 
         </condition>
 
@@ -480,6 +483,7 @@
         <property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
         <property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
         <property name="newt.jar" value="${build}/newt.jar" />
+        <property name="newt.awt.jar" value="${build}/newt.awt.jar" />
         <property name="jogl.oswin.jar" value="${build}/jogl.oswin.jar" />
         <property name="jogl.util.jar" value="${build}/jogl.util.jar" />
         <property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
@@ -1585,7 +1589,7 @@
         <jar manifest="tempversion" destfile="${jogl.core.jar}">
             <fileset dir="${classes}"
                      includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**"
-                     excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.oswin}, ${java.part.newt}"/>
+                     excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.gl2}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.oswin}, ${java.part.newt}, ${java.part.newt.awt}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gles1.jar}">
             <fileset dir="${classes}"
@@ -1607,7 +1611,8 @@
         </jar>
         <jar manifest="tempversion" destfile="${jogl.egl.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.egl}"/>
+                     includes="${java.part.egl}"
+                     excludes="${java.part.awt}"/>
         </jar>
         <jar manifest="tempversion" destfile="${jogl.gl2.jar}">
             <fileset dir="${classes}"
@@ -1627,6 +1632,10 @@
             <fileset dir="${classes}"
                      includes="${java.part.newt}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${newt.awt.jar}">
+            <fileset dir="${classes}"
+                     includes="${java.part.newt.awt}"/>
+        </jar>
         <jar manifest="tempversion" destfile="${jogl.oswin.jar}">
             <fileset dir="${classes}"
                      includes="${java.part.oswin}"