1 files changed, 22 insertions, 9 deletions
diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh
index 82e378e20..2cb4e1b56 100755
--- a/make/scripts/lstjars.sh
+++ b/make/scripts/lstjars.sh
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+#set -x
+
 THISDIR=$(pwd)
 
 BUILDDIR=$1
@@ -21,7 +23,7 @@ fi
 function report() {
     #ls -1 -s --block-size=1024 $*
     #ls -1 -s --block-size=1024 $* | awk ' BEGIN { sum=0 ; } { sum=sum+$1; } END { printf("%d Total\n", sum); }'
-    du -ksc $*
+    du -ksc $* | awk ' { printf("%5d kB  %s\n", $1, $2); } '
 }
 
 OSS=x11
@@ -35,15 +37,23 @@ function listdeployment() {
     echo
 
     echo JOGL ALL
-    report gluegen-rt.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_awt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX jogl-all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_awt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
     echo
 
     echo JOGL ALL no AWT
-    report gluegen-rt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX jogl-all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL Min X11 Min egl es1 es2
+    report gluegen-rt.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz
     echo
 
     echo JOGL Android - mobile egl es1 es2
-    report gluegen-rt.$JAR_SUFFIX jogl.all-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
+    report gluegen-rt-android.$JAR_SUFFIX jogl-all-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
+    echo
+
+    echo JOGL Min Android/Mobile Min egl es1 es2
+    report gluegen-rt-android.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
     echo
 }
 
@@ -52,6 +62,7 @@ mkdir -p $STATDIR
 cp -a $BUILDDIR/lib/*.so $STATDIR
 cp -a $BUILDDIR/jar/*    $STATDIR
 cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR
+cp -a $BUILDDIR_GLUEGEN/gluegen-rt-android.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR
 
 cd $STATDIR
@@ -84,22 +95,24 @@ sort atomic/jogl*.lst | uniq -d
 
 cat atomic/*.lst | sort -u > allparts.lst
 mv nope/*jar .
-cat jogl.all.lst gluegen-rt.lst  | sort -u > allall.lst
+cat jogl-all.lst gluegen-rt.lst  | sort -u > allall.lst
 
 echo all vs allparts delta
 echo
 diff -Nur allparts.lst allall.lst
 
-mv nope/* .
+mv nope/*.jar .
+#mv nope/atomic/*.jar atomic/
 
 listdeployment jar
 
 if [ $pack200 -eq 1 ] ; then
-    for i in *.jar ; do
+    for i in *.jar atomic/*jar ; do
         fname=$i
+        dname=$(dirname $fname)
         bname=$(basename $fname .jar)
-        echo pack200 $bname.pack.gz $fname
-        pack200 $bname.pack.gz $fname
+        echo pack200 $dname/$bname.pack.gz $fname
+        pack200 $dname/$bname.pack.gz $fname
     done
     listdeployment pack.gz
 fi