jenkins-build promotion: move all Android APK files in their own 'apk' subfolder to simplify directing users

2 files changed, 27 insertions, 2 deletions

diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh
index 34eb684..fb7b7bc 100755
--- a/jenkins-builds/funcs_promotion.sh
+++ b/jenkins-builds/funcs_promotion.sh
@@ -13,6 +13,7 @@ function prom_setup() {
         mkdir $ldest/archive/jogamp-$i/test-results/
     done
     mkdir $ldest/jar
+    mkdir $ldest/apk
     mkdir $ldest/jar/atomic
     mkdir $ldest/javadoc
     mkdir $ldest/jnlp-files
@@ -151,9 +152,13 @@ function prom_merge_modules() {
             else
                 if [ -e jar ] ; then
                     mkdir -p ../$mergefolder/jar
-                    for l in `find jar -maxdepth 1 -name \*natives\* -o -name \*.apk` ; do
+                    for l in `find jar -maxdepth 1 -name \*natives\*` ; do
                         cp -av $l ../$mergefolder/jar/
                     done
+                    for l in `find jar -maxdepth 1 -name \*.apk` ; do
+                        mkdir -p ../$mergefolder/apk
+                        cp -av $l ../$mergefolder/apk/
+                    done
                     if [ -e jar/atomic ] ; then
                         mkdir -p ../$mergefolder/jar/atomic
                         cp -av jar/atomic/*natives*.jar ../$mergefolder/jar/atomic/
@@ -171,6 +176,15 @@ function prom_merge_modules() {
             cd ..
         done
     done
+    # move unsigned APKs in seperate folder
+    if [ -e $mergefolder/apk ] ; then
+        cd $mergefolder/apk
+        mkdir unsigned
+        for i in *-unsigned.apk ; do
+            mv $i unsigned/`basename $i -unsigned.apk`.apk
+        done
+        cd ../..
+    fi
     cp -av ../log/aggregated.artifact.properties.sorted ../log/all.artifact.properties.sorted $mergefolder/
     echo "INFO: Create merged jogamp archive $mergefolder.7z"
     7z a -r ../archive/$mergefolder.7z $mergefolder
@@ -229,15 +243,25 @@ function prom_promote_module() {
         # 7z folder verfified above already
         local zfile=archive/jogamp-$i/$module-$i.7z
         local zfolder=tmp/`basename $zfile .7z`
-        for j in `find $zfolder/jar -maxdepth 1 -name \*.jar -o -name \*.apk` ; do
+        for j in `find $zfolder/jar -maxdepth 1 -name \*.jar` ; do
             cp -av $j ./jar/
         done
+        for j in `find $zfolder/jar -maxdepth 1 -name \*.apk` ; do
+            cp -av $j ./apk/
+        done
         if [ -e $zfolder/jar/atomic ] ; then
             for j in $zfolder/jar/atomic/*.jar ; do
                 cp -av $j ./jar/atomic/
             done
         fi
     done
+    # move unsigned APKs in seperate folder
+    cd apk
+    mkdir unsigned
+    for i in *-unsigned.apk ; do
+        mv $i unsigned/`basename $i -unsigned.apk`.apk
+    done
+    cd ..
     # copy the master pic JAR files
     # 7z folder verfified above already
     local zfile=archive/jogamp-$masterpick/$module-$masterpick.7z
diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index c61bdc1..8e4208a 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -189,6 +189,7 @@ function promote-latest-builds() {
 
     prom_integrity_check $dest jar            tmp/dump
     prom_integrity_check $dest jar/atomic     tmp/dump
+    prom_integrity_check $dest apk            tmp/dump
     prom_integrity_check $dest joal-demos/jar tmp/dump
     prom_integrity_check $dest jogl-demos/jar tmp/dump
     prom_integrity_check $dest jocl-demos/jar tmp/dump