promote-latest-builds.sh: Add ios arm64 + amd64 builds and android-x86 ; Refine variable naming

2 files changed, 10 insertions, 9 deletions

diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh
index 3896acb..af1ba57 100755
--- a/jenkins-builds/funcs_promotion.sh
+++ b/jenkins-builds/funcs_promotion.sh
@@ -240,7 +240,7 @@ function prom_promote_module() {
         prom_verify_artifacts $module log/$module.artifact.properties tmp/$zfolder/artifact.properties
     done
     # copy the platform JAR files from each platform 7z folder
-    for i in $os_and_archs_minus_one ; do
+    for i in $os_and_archs_minus_master ; do
         # 7z folder verfified above already
         local zfile=archive/jogamp-$i/$module-$i.7z
         local zfolder=tmp/`basename $zfile .7z`
@@ -308,7 +308,7 @@ function prom_make_fatjar() {
     cd tmp/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_minus_android ; do
+        for i in $os_and_archs_fatpack ; do
             unzip ../../jar/$h-$i.jar
             rm -rf META-INF
             mkdir -p natives/$i
@@ -317,7 +317,7 @@ function prom_make_fatjar() {
             done
         done
     done
-    for i in $os_and_archs_minus_android ; do
+    for i in $os_and_archs_fatpack ; do
         if [ -e ../../jar/atomic/oculusvr-natives-$i.jar ] ; then
             unzip ../../jar/atomic/oculusvr-natives-$i.jar
             rm -rf META-INF
diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index 6a79bd6..73f6471 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -35,13 +35,14 @@ logfile=$thisdir/`basename $0 .sh`.log
 archivedir=/srv/www/jogamp.org/deployment/archive/$branch
 rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
 
-#os_and_archs_minus_master_android="linux-i586 linux-armv6 linux-armv6hf macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
-os_and_archs_minus_master_android="linux-armv6hf linux-aarch64 macosx-universal windows-amd64"
-os_and_archs_android="android-armv6 android-aarch64"
+#os_and_archs_fatpack_minus_master="linux-i586 linux-armv6 linux-armv6hf macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
+os_and_archs_fatpack_minus_master="linux-armv6hf linux-aarch64 macosx-universal windows-amd64"
+os_and_archs_android="android-armv6 android-aarch64 android-x86"
+os_and_archs_ios="ios-amd64 ios-arm64"
 masterpick="linux-amd64"
-os_and_archs_minus_one="$os_and_archs_minus_master_android $os_and_archs_android"
-os_and_archs_minus_android="$masterpick $os_and_archs_minus_master_android"
-os_and_archs="$masterpick $os_and_archs_minus_one"
+os_and_archs_minus_master="$os_and_archs_fatpack_minus_master $os_and_archs_android $os_and_archs_ios"
+os_and_archs_fatpack="$masterpick $os_and_archs_fatpack_minus_master"
+os_and_archs="$masterpick $os_and_archs_minus_master"
 
 cd $rootdir