deployment resturcturing: combine nativewindow/jogl/newt ; newt: 'driver' separation ; android cleanup

remaining all-in-one jnlp's / jars:
  jogl-all-awt.jnlp    -> jogl.all.jar
  jogl-all-noawt.jnlp  -> jogl.all-noawt.jar
  jogl-all-mobile.jnlp -> jogl.all-mobile.jar
  native for all above:   jogl-all-natives-linux-amd64.jar

  jogl.all-android.apk    jogl.all-android.jar

  more may follow for each supported platfrom

++++

- newt: proper 'driver' separation
  - all drivers reside now in jogamp.newt.driver.*

- remove intptr.cfg / use gluegen's

1 files changed, 22 insertions, 56 deletions

diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh
index c72a48a9b..82e378e20 100755
--- a/make/scripts/lstjars.sh
+++ b/make/scripts/lstjars.sh
@@ -34,61 +34,33 @@ function listdeployment() {
     echo JOGL Deployment Payload for $JAR_SUFFIX
     echo
 
-    echo JOGL ES1 NEWT CORE
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz
+    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
     echo
 
-    echo JOGL ES2 NEWT CORE
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
+    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
     echo
 
-    echo JOGL ES2 NEWT CORE FIXED
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz
-    echo
-
-    echo JOGL GL2ES12 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
-    echo
-
-    echo JOGL GL2 NEWT 
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz
-    echo
-
-    echo JOGL GL2 AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
-    echo
-
-    echo JOGL ALL AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz
-    echo
-
-    echo JOGL ALL No AWT
-    report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz
-    echo
-
-    echo JOGL GLU
-    report jogl.glu.*$JAR_SUFFIX
-    echo
-
-    echo JOGL EVERYTHING
-    report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz  libjogl_es1.so.gz  libjogl_es2.so.gz  libnewt.so.gz
+    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
     echo
 }
 
 rm -rf $STATDIR
 mkdir -p $STATDIR
-cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR
-cp -a $BUILDDIR/jogl/obj/*.so $STATDIR
-cp -a $BUILDDIR/newt/obj/*.so $STATDIR
-cp -a $BUILDDIR/nativewindow/*.jar $STATDIR
-cp -a $BUILDDIR/jogl/*.jar $STATDIR
-cp -a $BUILDDIR/newt/*.jar $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-natives-linux-i586.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR
 
 cd $STATDIR
 
+rm -rf nope
+mkdir -p nope/atomic
+mv gluegen*jar *-natives*.jar nope/
+mv atomic/gluegen-gl.jar nope/atomic
+
 for i in *.so ; do
     gzip $i
 done
@@ -99,33 +71,27 @@ echo
 
 rm -f *.lst
 
-for i in *.jar ; do
+for i in *.jar atomic/*.jar ; do
     fname=$i
-    bname=$(basename $fname .jar)
+    bname=$(dirname $fname)/$(basename $fname .jar)
     echo list $fname to $bname.lst
     jar tf $fname | grep class | sort > $bname.lst
 done
 
-rm -rf nope
-mkdir -p nope
-
-mv jogl.test.lst *-noawt.lst *.all*.lst nope/
-
-mv jogl.gl2es12.*.lst jogl.gldesktop.*.lst nope/
-echo duplicates - w/o gl2es12.* gldesktop.*
+echo duplicates in atomics
 echo
-sort jogl*.lst | uniq -d
-mv nope/* .
+sort atomic/jogl*.lst | uniq -d
 
-mv jogl.test.lst *.all*.lst gluegen-gl.lst nope/
-cat *.lst | sort -u > allparts.lst
-mv nope/* .
-cat *.all.lst gluegen-rt.lst   | sort -u > allall.lst
+cat atomic/*.lst | sort -u > allparts.lst
+mv nope/*jar .
+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/* .
+
 listdeployment jar
 
 if [ $pack200 -eq 1 ] ; then