summaryrefslogtreecommitdiffstats
path: root/hudson-builds/promote-latest-builds.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-29 06:02:34 +0100
committerSven Gothel <[email protected]>2010-11-29 06:02:34 +0100
commit0fd8144f1e151b18bc9b45e130b5f923df8a1f05 (patch)
tree9ef72acbaafcbda2e6b430fddec8bf3c45560b92 /hudson-builds/promote-latest-builds.sh
parentfa337a3723a2b376bdc7f74da5f5321eb8cb57f3 (diff)
Add JOCL; jogl-demos and jocl-demos reside in their own subfolder now
Diffstat (limited to 'hudson-builds/promote-latest-builds.sh')
-rwxr-xr-xhudson-builds/promote-latest-builds.sh124
1 files changed, 64 insertions, 60 deletions
diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh
index 7c3e9b1..4d432aa 100755
--- a/hudson-builds/promote-latest-builds.sh
+++ b/hudson-builds/promote-latest-builds.sh
@@ -112,60 +112,69 @@ function promote-latest-builds() {
fname=`find . -name jogl-demos*.zip`
bname=`basename $fname .zip`
+ mkdir jogl-demos
+ cd jogl-demos
echo "INFO: unzip $fname -> $bname"
- unzip -q $bname.zip
- prom_verify_artifacts jogl-demos jogl-demos-master.artifact.properties $bname/artifact.properties
- cp -a $bname/jar/*.jar .
- cp -a $bname/jnlp-files/* ./jnlp-files/
- cp -a $bname/www/* ./www/
+ unzip -q ../$bname.zip
+ prom_verify_artifacts jogl-demos ../jogl-demos-master.artifact.properties $bname/artifact.properties
+ mv $bname/jar .
+ mv $bname/jnlp-files .
+ mv $bname/www .
echo "INFO: delete folder $bname"
rm -rf $bname
+ cd $rootdir
+ joclslave=`prom_lslatest jocl-b`
+ bjoclslave=`prom_buildnumber_2 $joclslave`
+ joclmaster=`prom_lslatest jocl-master-b`
+ bjoclmaster=`prom_buildnumber_3 $joclmaster`
+ echo
+ echo JOCL
+ echo
+ echo slave build $bjoclslave - $joclslave
+ echo master build $bjoclmaster - $joclmaster
+ echo
+ echo "jocl.build.number=$bjoclslave" >> $dest/aggregated.artifact.properties
+
+ 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
+ cd $dest/javadoc
+ unzip -q ../jocl-javadoc.zip
cd $rootdir
- #########################################################
- ####### FIXME : JOCL, adapt to the new archive structure
- #########################################################
+ jocldemosslave=`prom_lslatest jocl-demos-b`
+ bjocldemosslave=`prom_buildnumber_3 $jocldemosslave`
+ jocldemosmaster=`prom_lslatest jocl-demos-master-b`
+ bjocldemosmaster=`prom_buildnumber_4 $jocldemosmaster`
+ echo
+ echo JOCL DEMOS
+ echo
+ echo slave build $bjocldemosslave - $jocldemosslave
+ echo master build $bjocldemosmaster - $jocldemosmaster
+ echo
+ echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties
+
+ cp -a $jocldemosmaster/jocl-demos*zip $dest/
+ cp -a $jocldemosmaster/artifact.properties $dest/jocl-demos-master.artifact.properties
+ cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
+ cd $dest
+
+ fname=`find . -name jocl-demos*.zip`
+ bname=`basename $fname .zip`
+ mkdir jocl-demos
+ cd jocl-demos
+ echo "INFO: unzip $fname -> $bname"
+ unzip -q ../$bname.zip
+ prom_verify_artifacts jocl-demos ../jocl-demos-master.artifact.properties $bname/artifact.properties
+ mv $bname/jar .
+ mv $bname/jnlp-files .
+ mv $bname/www .
+ echo "INFO: delete folder $bname"
+ rm -rf $bname
+ cd $rootdir
-## joclslave=`prom_lslatest jocl-b`
-## bjoclslave=`prom_buildnumber_2 $joclslave`
-## joclmaster=`prom_lslatest jocl-master-b`
-## bjoclmaster=`prom_buildnumber_3 $joclmaster`
-## echo
-## echo JOCL
-## echo
-## echo slave build $bjoclslave - $joclslave
-## echo master build $bjoclmaster - $joclmaster
-## echo
-## echo "jocl.build.number=$bjoclslave" >> $dest/aggregated.artifact.properties
-##
-## #
-## #prom_promote_files jocl $joglslave $dest jocl
-## #
-##
-## cp -a $joclslave/jocl*jar $dest/
-## cp -a $joclslave/artifact.properties $dest/jocl.artifact.properties
-##
-## cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties
-## mkdir $dest/javadoc/jocl
-## cp -a $joclmaster/jocl-javadoc.zip $dest/
-## cd $dest/javadoc/jocl
-## echo "INFO: unzip jocl-javadoc zip"
-## unzip -q ../../jocl-javadoc.zip
-## cd $rootdir
-##
-## jocldemosslave=`prom_lslatest jocl-demos-b`
-## bjocldemosslave=`prom_buildnumber_3 $jocldemosslave`
-## echo
-## echo JOCL DEMOS
-## echo
-## echo slave build $bjocldemosslave - $jocldemosslave
-## echo
-## echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties
-##
-## cp -a $jocldemosslave/jocl-demos*jar $dest/
-## cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
-##
#########################################################
## Integrity Check, Cleanup, aggregation.properties
@@ -175,13 +184,9 @@ function promote-latest-builds() {
prom_cleanup $dest
-# uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-# url=http://jogamp.org/deployment/archive/$branch/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-# wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-
- uri=gluegen_$bgluegenslave-jogl_$bjoglslave
- url=http://jogamp.org/deployment/archive/$branch/gluegen_$bgluegenslave-jogl_$bjoglslave
- wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave
+ uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+ url=http://jogamp.org/deployment/archive/$branch/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+ wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
rm -rf $wsdir
mv $dest $wsdir
@@ -191,14 +196,13 @@ function promote-latest-builds() {
echo
echo aggregation.properties
echo
- #cat jocl-demos.artifact.properties jogl-demos.artifact.properties | sort -u > jocl-demos-jogl-demos.artifact.properties.sorted
- #sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
- #diff -Nurbw aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
- cat jogl-demos.artifact.properties | sort -u > jogl-demos.artifact.properties.sorted
+ cat jocl-demos.artifact.properties jogl-demos.artifact.properties | sort -u > jocl-demos-jogl-demos.artifact.properties.sorted
sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
- diff -Nurbw aggregated.artifact.properties.sorted jogl-demos.artifact.properties.sorted
+ diff -Nurbw aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
- copy_relocate_jnlps $url $wsdir
+ copy_relocate_jnlps_base $url $wsdir
+ copy_relocate_jnlps_demos $url $wsdir jogl-demos
+ copy_relocate_jnlps_demos $url $wsdir jocl-demos
if [ $secure -ne 1 ] ; then
remove_security_tag_jnlps $wsdir