diff options
| -rwxr-xr-x | hudson-builds/funcs_promotion.sh | 46 | ||||
| -rwxr-xr-x | hudson-builds/promote-latest-builds.sh | 54 |
2 files changed, 52 insertions, 48 deletions
diff --git a/hudson-builds/funcs_promotion.sh b/hudson-builds/funcs_promotion.sh index b15475e..6a2427e 100755 --- a/hudson-builds/funcs_promotion.sh +++ b/hudson-builds/funcs_promotion.sh @@ -62,7 +62,7 @@ function prom_verify_artifacts() { # #1 module name, IE gluegen, jogl, jocl or joal # #2 source folder of artifacts # #3 destination folder of artifacts -# #4-n submodule name within the ZIP files +# #4-n submodule name within the 7z files # # Example: # promote_files gluegen /builds/gluegen-b33 tmp-archive gluegen @@ -80,27 +80,27 @@ function prom_promote_files() { local lthisdir=`pwd` echo "INFO: Promoting files: $module, submodules <$submodules>, from $sourcedir" - # copy the platform zip files - cp -a $sourcedir/$module*.zip $destdir/ + # copy the platform 7z files + cp -a $sourcedir/$module*.7z $destdir/ cp -a $sourcedir/artifact.properties $destdir/$module.artifact.properties cd $destdir - # unpack the platform zip files + # unpack the platform 7z files for i in $os_and_archs ; do - local zfile=`find . -name $module\*$i.zip` + local zfile=`find . -name $module\*$i.7z` if [ -z "$zfile" ] ; then - echo "ERROR: No platform ZIP file for module $module, sub $sub, platform $i, sdir $sourcedir" + echo "ERROR: No platform 7z file for module $module, sub $sub, platform $i, sdir $sourcedir" exit 1 fi - local zfolder=`basename $zfile .zip` - echo "INFO: unzip $module $i - $zfile -> $zfolder" - prom_unzip $zfile + local zfolder=`basename $zfile .7z` + echo "INFO: extract $module $i - $zfile -> $zfolder" + prom_extract $zfile prom_verify_artifacts $module $module.artifact.properties $zfolder/artifact.properties done - # copy the platform JAR files from each platform zip folder + # copy the platform JAR files from each platform 7z folder for i in $os_and_archs_minus_one ; do - # zip folder verfified above already - local zfile=`find . -name $module\*$i.zip` - local zfolder=`basename $zfile .zip` + # 7z folder verfified above already + local zfile=`find . -name $module\*$i.7z` + local zfolder=`basename $zfile .7z` for sub in $submodules ; do jars=`find $zfolder -name $sub\*$i\*.jar` if [ -z "$jars" ] ; then @@ -113,9 +113,9 @@ function prom_promote_files() { done done # copy the master pic JAR files - # zip folder verfified above already - local zfile=`find . -name $module\*$masterpick.zip` - local zfolder=`basename $zfile .zip` + # 7z folder verfified above already + local zfile=`find . -name $module\*$masterpick.7z` + local zfolder=`basename $zfile .7z` for sub in $submodules ; do local jars=`find $zfolder -name $sub\*$masterpick\*.jar` if [ -z "$jars" ] ; then @@ -136,16 +136,16 @@ function prom_promote_files() { cd $lthisdir } -function prom_unzip() { +function prom_extract() { local zfile=$1 shift local OK=0 - unzip -q $zfile && OK=1 + 7z x $zfile && OK=1 if [ $OK -eq 0 ] ; then - echo ERROR in ZIP file $zfile + echo ERROR in 7z file $zfile else - echo OK ZIP file $zfile + echo OK 7z file $zfile fi } @@ -157,15 +157,15 @@ function prom_cleanup() { cd $destdir for i in $os_and_archs ; do - for j in *$i.zip ; do - local bname=`basename $j .zip` + for j in *$i.7z ; do + local bname=`basename $j .7z` if [ -d $bname ] ; then echo "INFO: delete folder $bname" rm -rf $bname fi done done - mv *.zip archive/ + mv *.7z archive/ cd $lthisdir } diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh index b71da36..b6fc1fa 100755 --- a/hudson-builds/promote-latest-builds.sh +++ b/hudson-builds/promote-latest-builds.sh @@ -69,10 +69,10 @@ function promote-latest-builds() { prom_promote_files gluegen $gluegenslave $dest gluegen cp -a $gluegenmaster/artifact.properties $dest/javadoc/gluegen-master.artifact.properties - cp -a $gluegenmaster/javadoc.zip $dest/gluegen-javadoc.zip + cp -a $gluegenmaster/javadoc.7z $dest/gluegen-javadoc.7z cd $dest/javadoc - echo "INFO: gluegen master gluegen-javadoc zip" - prom_unzip ../gluegen-javadoc.zip + echo "INFO: gluegen master gluegen-javadoc 7z" + prom_extract ../gluegen-javadoc.7z cd $rootdir joalslave=`prom_lslatest joal-b` @@ -86,9 +86,9 @@ function promote-latest-builds() { prom_promote_files joal $joalslave $dest joal - cp -a $joalslave/javadoc.zip $dest/joal-javadoc.zip + cp -a $joalslave/javadoc.7z $dest/joal-javadoc.7z cd $dest/javadoc - prom_unzip ../joal-javadoc.zip + prom_extract ../joal-javadoc.7z cd $rootdir joaldemosslave=`prom_lslatest joal-demos-b` @@ -100,16 +100,16 @@ function promote-latest-builds() { echo echo "joal-demos.build.number=$bjoaldemosslave" >> $dest/aggregated.artifact.properties - cp -a $joaldemosslave/joal-demos*.zip $dest/ + cp -a $joaldemosslave/joal-demos*.7z $dest/ cp -a $joaldemosslave/artifact.properties $dest/joal-demos.artifact.properties cd $dest - fname=`find . -name joal-demos\*$masterpick.zip` - bname=`basename $fname .zip` + fname=`find . -name joal-demos\*$masterpick.7z` + bname=`basename $fname .7z` mkdir joal-demos cd joal-demos - echo "INFO: unzip $fname -> $bname" - prom_unzip ../$bname.zip + echo "INFO: extract $fname -> $bname" + prom_extract ../$bname.7z mv $bname/jar/* . mv $bname/jnlp-files . mv $bname/www . @@ -132,30 +132,34 @@ function promote-latest-builds() { prom_promote_files jogl $joglslave $dest nativewindow jogl newt cp -a $joglmaster/artifact.properties $dest/javadoc/jogl-master.artifact.properties - cp -a $joglmaster/javadoc.zip $dest/jogl-javadoc.zip + cp -a $joglmaster/javadoc.7z $dest/jogl-javadoc.7z cd $dest/javadoc - prom_unzip ../jogl-javadoc.zip + prom_extract ../jogl-javadoc.7z cd $rootdir jogldemosslave=`prom_lslatest jogl-demos-b` bjogldemosslave=`prom_buildnumber_3 $jogldemosslave` + jogldemosmaster=`prom_lslatest jogl-demos-master-b` + bjogldemosmaster=`prom_buildnumber_4 $jogldemosmaster` echo echo JOGL DEMOS echo echo slave build $bjogldemosslave - $jogldemosslave + echo master build $bjogldemosmaster - $jogldemosmaster echo echo "jogl-demos.build.number=$bjogldemosslave" >> $dest/aggregated.artifact.properties + echo "jogl-demos.build.number=$bjogldemosmaster" >> $dest/aggregated.artifact.properties - cp -a $jogldemosslave/jogl-demos*.zip $dest/ - cp -a $jogldemosslave/artifact.properties $dest/jogl-demos.artifact.properties + cp -a $jogldemosmaster/jogl-demos*.7z $dest/ + cp -a $jogldemosmaster/artifact.properties $dest/jogl-demos.artifact.properties cd $dest - fname=`find . -name jogl-demos\*$masterpick.zip` - bname=`basename $fname .zip` + fname=`find . -name jogl-demos\*$masterpick.7z` + bname=`basename $fname .7z` mkdir jogl-demos cd jogl-demos - echo "INFO: unzip $fname -> $bname" - prom_unzip ../$bname.zip + echo "INFO: extract $fname -> $bname" + prom_extract ../$bname.7z mv $bname/jar/* . mv $bname/jnlp-files . mv $bname/www . @@ -178,9 +182,9 @@ function promote-latest-builds() { prom_promote_files jocl $joclslave $dest jocl cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties - cp -a $joclmaster/jocl-javadoc.zip $dest/jocl-javadoc.zip + cp -a $joclmaster/jocl-javadoc.7z $dest/jocl-javadoc.7z cd $dest/javadoc - prom_unzip ../jocl-javadoc.zip + prom_extract ../jocl-javadoc.7z cd $rootdir jocldemosslave=`prom_lslatest jocl-demos-b` @@ -192,16 +196,16 @@ function promote-latest-builds() { echo echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties - cp -a $jocldemosslave/jocl-demos*zip $dest/ + cp -a $jocldemosslave/jocl-demos*7z $dest/ cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties cd $dest - fname=`find . -name jocl-demos\*$masterpick.zip` - bname=`basename $fname .zip` + fname=`find . -name jocl-demos\*$masterpick.7z` + bname=`basename $fname .7z` mkdir jocl-demos cd jocl-demos - echo "INFO: unzip $fname -> $bname" - prom_unzip ../$bname.zip + echo "INFO: extract $fname -> $bname" + prom_extract ../$bname.7z mv $bname/jar/* . mv $bname/jnlp-files . mv $bname/www . |