diff options
| -rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 8 | ||||
| -rwxr-xr-x | jenkins-builds/promote-latest-builds.sh | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 47760aa..b82fa04 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -155,7 +155,9 @@ function prom_merge_modules() { else if [ -e jar ] ; then mkdir -p ../$mergefolder/jar - cp -av jar/*natives*.jar ../$mergefolder/jar/ + for l in jar/*natives*.jar jar/*.apk ; do + cp -av $l ../$mergefolder/jar/ + done if [ -e jar/atomic ] ; then mkdir -p ../$mergefolder/jar/atomic cp -av jar/atomic/*natives*.jar ../$mergefolder/jar/atomic/ @@ -228,7 +230,7 @@ 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 $zfolder/jar/*.jar ; do + for j in $zfolder/jar/*.jar $zfolder/jar/*.apk ; do cp -av $j ./jar/ done if [ -e $zfolder/jar/atomic ] ; then @@ -354,7 +356,7 @@ function prom_integrity_check() { mkdir -p $tmpdir cd $tmpdir - for i in $lthisdir/$destdir/$jardir/*.jar ; do + for i in $lthisdir/$destdir/$jardir/*.jar $lthisdir/$destdir/$jardir/*.apk ; do local bname=`basename $i` echo -n "INFO: integrity check - $bname - " local OK=0 diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh index adb21e6..01b52dd 100755 --- a/jenkins-builds/promote-latest-builds.sh +++ b/jenkins-builds/promote-latest-builds.sh @@ -34,7 +34,7 @@ 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_one="linux-i586 linux-armv7 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64" +os_and_archs_minus_one="linux-i586 linux-armv7 android-armv7 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64" masterpick="linux-amd64" os_and_archs="$masterpick $os_and_archs_minus_one" |