Adding missing GL3 Debug/Trace to gl2 dbg JAR; Verifying unified CDCFP JARs of cdcfp-build vs all-build (OK)

2 files changed, 37 insertions, 14 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 06d606df0..6d24ae84e 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1804,7 +1804,7 @@
         </jar>
         <jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}">
             <fileset dir="${classes}"
-                     includes="${java.part.gl2.dbg}"/>
+                     includes="${java.part.gl2.dbg} ${java.part.gl3.dbg}"/>
         </jar>
         <jar manifest="${build}/tempversion" destfile="${jogl.glugl2.jar}">
             <fileset dir="${classes}"
diff --git a/make/lstjars.sh b/make/lstjars.sh
index d170df308..a29a9a68a 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -4,11 +4,17 @@ THISDIR=$(pwd)
 STATDIR=$THISDIR/../stats
 
 BUILDDIR=$1
+shift
 if [ -z "$BUILDDIR" ] ; then 
     echo "usage $0 <BUILDDIR>"
     exit 1
 fi
 
+skippack200=0
+if [ "$1" = "-skippack200" ] ; then
+    skippack200=1
+fi
+
 idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl
 
 
@@ -42,8 +48,6 @@ rm -f *.lst
 for i in *.jar ; do
     fname=$i
     bname=$(basename $fname .jar)
-    echo pack200 $bname.pack.gz $fname
-    pack200 $bname.pack.gz $fname
     echo list $fname to $bname.lst
     jar tf $fname | grep class | sort > $bname.lst
 done
@@ -51,9 +55,7 @@ done
 rm -rf nope
 mkdir -p nope
 
-rm -f allparts.lst allall.lst
-
-mv jogl.all.lst nope/
+mv *.cdcfp.lst *.all.lst nope/
 
 mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/
 echo duplicates - w/o gl2es12.* gl2.*
@@ -61,39 +63,60 @@ echo
 sort jogl*.lst | uniq -d
 mv nope/* .
 
-mv *.all.lst nope/
+mv *.cdcfp.lst *.all.lst nope/
 cat *.lst | sort -u > allparts.lst
 mv nope/* .
-cat *.all.lst | sort -u > allall.lst
+cat *.all.lst   | sort -u > allall.lst
+cat jogl.cdcfp.lst newt.cdcfp.lst nativewindow.core.lst | sort -u > allcdcfp.lst
 
 echo all vs allparts delta
 echo
 diff -Nur allparts.lst allall.lst
 
+if [ $skippack200 -eq 0 ] ; then
+    for i in *.jar ; do
+        fname=$i
+        bname=$(basename $fname .jar)
+        echo pack200 $bname.pack.gz $fname
+        pack200 $bname.pack.gz $fname
+    done
+    JAR_SUFFIX=pack.gz
+else
+    JAR_SUFFIX=jar
+fi
+
 OSS=x11
 
 echo JOGL ES1 NEWT CORE
-report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles1.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es1.so.gz libnewt.so.gz
+report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es1.so.gz libnewt.so.gz
 echo
 
 echo JOGL ES2 NEWT CORE
-report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
+report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es2.so.gz libnewt.so.gz
 echo
 
 echo JOGL ES2 NEWT CORE FIXED
-report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.egl.pack.gz jogl.gles2.pack.gz jogl.util.fixedfuncemu.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_es2.so.gz libnewt.so.gz
+report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_es2.so.gz libnewt.so.gz
 echo
 
 echo JOGL GL2ES12 NEWT 
-report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2es12.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2es12.so.gz libnewt.so.gz
+report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
 echo
 
 echo JOGL GL2 NEWT 
-report nativewindow.core.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2.$OSS.pack.gz newt.core.pack.gz newt.ogl.pack.gz libjogl_gl2.so.gz libnewt.so.gz
+report nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
 echo
 
 echo JOGL GL2 AWT
-report nativewindow.core.pack.gz nativewindow.awt.pack.gz jogl.core.pack.gz jogl.util.pack.gz jogl.gl2.$OSS.pack.gz jogl.awt.pack.gz libjogl_gl2.so.gz libjogl_awt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
+report nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libjogl_gl2.so.gz libjogl_awt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
+echo
+
+echo JOGL ALL
+report nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libjogl_gl2.so.gz libjogl_awt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+echo
+
+echo JOGL CDCFP
+report nativewindow.core.$JAR_SUFFIX jogl.cdcfp.$JAR_SUFFIX newt.cdcfp.$JAR_SUFFIX libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
 echo
 
 echo JOGL GLU