promote_lates_build: Allow missing module/platform artifacts and include *.symbols and *.a files in natives

Currently JOCL will not be build on iOS (private framework only), hence be tolerant
for missing module/platform combos IF not a masterpick! Only print WARNING.

Adding static *.a libs for iOS and also include the *.symbols files if exists.

2 files changed, 47 insertions, 19 deletions

diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh
index 689ab78..4b7fc71 100755
--- a/jenkins-builds/funcs_promotion.sh
+++ b/jenkins-builds/funcs_promotion.sh
@@ -127,8 +127,14 @@ function prom_merge_modules() {
         for j in $modules ; do
             local modulefolder=`find . -name $j\*$i`
             if [ -z "$modulefolder" ] ; then
-                echo "ERROR: No module/platform extracted folder module $j, platform $i"
-                exit 1
+                if [ "$masterpick" = "$i" ] ; then
+                    echo "ERROR: No masterpick module/platform extracted folder module $j, platform $i"
+                    exit 1
+                else
+                    # continue with next module/platform tuple ..
+                    echo "WARNING: No module/platform extracted folder module $j, platform $i"
+                    continue
+                fi
             fi
             cd $modulefolder
             if [ "$masterpick" = "$i" ] ; then
@@ -225,8 +231,14 @@ function prom_promote_module() {
     for i in $os_and_archs ; do
         local sfile=`find $lthisdir/$sourcedir -name $module\*$i.7z`
         if [ -z "$sfile" ] ; then
-            echo "ERROR: No platform 7z file for module $module, platform $i, sdir $sourcedir"
-            exit 1
+            if [ "$masterpick" = "$i" ] ; then
+                echo "ERROR: No masterpick platform 7z file for module $module, platform $i, sdir $sourcedir"
+                exit 1
+            else
+                # continue with next module/platform tuple ..
+                echo "WARNING: No platform 7z file for module $module, platform $i, sdir $sourcedir"
+                continue
+            fi
         fi
         local zfile=archive/jogamp-$i/$module-$i.7z
 
@@ -246,16 +258,20 @@ 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` ; 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/
+        if [ -e $zfolder ] ; then
+            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
+        else
+            echo "WARNING: No platform 7z folder for module $module, platform $i"
         fi
     done
     # move unsigned APKs in seperate folder
@@ -311,12 +327,16 @@ function prom_make_fatjar() {
     fat_native_modules="gluegen-rt-natives joal-natives jogl-all-natives jocl-natives"
     for h in $fat_native_modules ; do
         for i in $os_and_archs_fatpack ; do
-            unzip ../../jar/$h-$i.jar
-            rm -rf META-INF
-            mkdir -p natives/$i
-            for j in `find . -maxdepth 1 -name \*.so -o -name \*.dll -o -name \*.jnilib -o -name \*dylib` ; do
-                mv $j natives/$i/
-            done
+            if [ -e ../../jar/$h-$i.jar ] ; then
+                unzip ../../jar/$h-$i.jar
+                rm -rf META-INF
+                mkdir -p natives/$i
+                for j in `find . -maxdepth 1 -name \*.symbols -o -name \*.a -o -name \*.so -o -name \*.dll -o -name \*.jnilib -o -name \*dylib` ; do
+                    mv $j natives/$i/
+                done
+            else
+                echo "WARNING: No native jar file for module $h, platform $i (fat)"
+            fi
         done
     done
     for i in $os_and_archs_fatpack ; do
diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index f201a4c..ba9627f 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -31,6 +31,7 @@ logfile=$thisdir/`basename $0 .sh`.log
 
 . $sdir/funcs_promotion.sh
 . $sdir/../deployment/funcs_jnlp_relocate.sh
+. $sdir/../deployment/funcs_jars_pack_sign.sh
 
 archivedir=/srv/www/jogamp.org/deployment/archive/$branch
 rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
@@ -265,6 +266,13 @@ function promote-latest-builds() {
     cp -av ../util/unsigned/junit.* jar/
 
     local OK=1
+    grep WARNING $logfile && OK=0
+    if [ $OK -eq 0 ] ; then
+        echo WARNING occured - please check $logfile for WARNING
+    else
+        echo NO ERRORS detected
+    fi
+    OK=1
     grep ERROR $logfile && OK=0
     if [ $OK -eq 0 ] ; then
         echo ERRORS occured - please check $logfile for ERROR