9 files changed, 34 insertions, 36 deletions
diff --git a/make/gl-impl-CustomJavaCode-gl2_es2.java b/make/gl-impl-CustomJavaCode-gl2_es2.java
index 855d1577d..9ddbf06fb 100644
--- a/make/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/gl-impl-CustomJavaCode-gl2_es2.java
@@ -294,9 +294,8 @@
 
   public final String toString() {
       StringBuffer buf = new StringBuffer();
-      buf.append("GL: ");
       buf.append(getClass().getName());
-      buf.append(" (GLSL compiler: ");
+      buf.append(" [GLSL compiler: ");
       buf.append(glShaderCompilerAvailable());
       Set bfs = glGetShaderBinaryFormats();
       buf.append(", binary formats ");
@@ -306,20 +305,7 @@
           buf.append(" ");
           buf.append(((Integer)(iter.next())).intValue());
       }
-      buf.append(") (GLContext: ");
-      GLContext context = getContext();
-      buf.append(context.getClass().getName());
-      buf.append(", GLDrawable: ");
-      GLDrawable drawable = context.getGLDrawable();
-      if(null!=drawable) {
-          buf.append(drawable.getClass().getName());
-          buf.append(", Factory: ");
-          GLDrawableFactory factory = drawable.getFactory();
-          buf.append(factory.getClass().getName());
-      } else {
-          buf.append("n/a");
-      }
-      buf.append(")");
+      buf.append("]");
       return buf.toString();
   }
 
diff --git a/make/gl-impl-CustomJavaCode-gles1.java b/make/gl-impl-CustomJavaCode-gles1.java
index 8057262f9..909fa7009 100755
--- a/make/gl-impl-CustomJavaCode-gles1.java
+++ b/make/gl-impl-CustomJavaCode-gles1.java
@@ -303,24 +303,7 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
 native private long dispatch_glMapBuffer(int target, int access, long glProcAddress);
 
   public final String toString() {
-      StringBuffer buf = new StringBuffer();
-      buf.append("GL: ");
-      buf.append(getClass().getName());
-      buf.append(" (GLContext: ");
-      GLContext context = getContext();
-      buf.append(context.getClass().getName());
-      buf.append(", GLDrawable: ");
-      GLDrawable drawable = context.getGLDrawable();
-      if(null!=drawable) {
-          buf.append(drawable.getClass().getName());
-          buf.append(", Factory: ");
-          GLDrawableFactory factory = drawable.getFactory();
-          buf.append(factory.getClass().getName());
-      } else {
-          buf.append("n/a");
-      }
-      buf.append(")");
-      return buf.toString();
+      return getClass().getName();
   }
 
 public void glVertexPointer(GLArrayData array) {
diff --git a/make/glu-CustomJavaCode-base.java b/make/glu-CustomJavaCode-base.java
index 272377ece..aca542eb7 100755
--- a/make/glu-CustomJavaCode-base.java
+++ b/make/glu-CustomJavaCode-base.java
@@ -113,6 +113,13 @@ public GLU()
   this.project = new ProjectFloat();
 }
 
+public void destroy() {
+  if(null!=this.project) {
+      this.project.destroy();
+      this.project=null;
+  }
+}
+
 public static final GL getCurrentGL() throws GLException {
   GLContext curContext = GLContext.getCurrent();
   if (curContext == null) {
diff --git a/make/glu-CustomJavaCode-gl2.java b/make/glu-CustomJavaCode-gl2.java
index bb01871d7..aedacf3dd 100644
--- a/make/glu-CustomJavaCode-gl2.java
+++ b/make/glu-CustomJavaCode-gl2.java
@@ -34,6 +34,14 @@ public GLUgl2()
   this.project = new ProjectDouble();
 }
 
+public void destroy() {
+  if(null!=this.project) {
+      this.project.destroy();
+      this.project=null;
+  }
+  super.destroy();
+}
+
 
 //----------------------------------------------------------------------
 // Utility routines
diff --git a/make/glu-CustomJavaCode-gl2es1.java b/make/glu-CustomJavaCode-gl2es1.java
index 24f161985..95e96c2e2 100755
--- a/make/glu-CustomJavaCode-gl2es1.java
+++ b/make/glu-CustomJavaCode-gl2es1.java
@@ -36,6 +36,10 @@ public GLUgl2es1()
   super();
 }
 
+public void destroy() {
+  super.destroy();
+}
+
 //----------------------------------------------------------------------
 // Utility routines
 //
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index cb0b44771..a9e4e8d85 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -4,11 +4,12 @@
 
 #    -Dc.compiler.debug=true 
 
-ant -v \
+ant \
     -Drootrel.build=build-x86 \
     -Dgluegen.cpptasks.detected.os=true \
     -DisUnix=true \
     -DisLinux=true \
     -DisLinuxX86=true \
     -DisX11=true \
+    -DuseKD=true \
     $* 2>&1 | tee make.jogl.all.linux-x86.log
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index 4a9d780a7..1a33f6708 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -4,7 +4,7 @@
 
 #    -Dc.compiler.debug=true 
 
-ant -v \
+ant \
     -Drootrel.build=build-x86_64 \
     -Dgluegen.cpptasks.detected.os=true \
     -DisUnix=true \
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 56296b529..6d216f65a 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -10,6 +10,7 @@
 #    -Djava.generate.skip=true \
 
 ant -v \
+    -Drootrel.build=build-cdcfp-x86 \
     -Djogl.cdcfp=true \
     -Dgluegen.cpptasks.detected.os=true \
     -DisUnix=true \
diff --git a/make/make.jogl.doc.all.x86.sh b/make/make.jogl.doc.all.x86.sh
new file mode 100644
index 000000000..ab86fefd0
--- /dev/null
+++ b/make/make.jogl.doc.all.x86.sh
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+. ../../setenv-build-jogl-x86.sh
+
+ant -v  \
+    -Drootrel.build=build-x86\
+    -DuseKD=true \
+    javadoc.spec javadoc javadoc.dev.all $* 2>&1 | tee make.jogl.doc.all.x86.log