diff options
| -rwxr-xr-x | deployment/funcs_jars_pack_sign.sh | 2 | ||||
| -rwxr-xr-x | deployment/funcs_jnlp_relocate.sh | 59 | ||||
| -rwxr-xr-x | hudson-builds/promote-latest-builds.sh | 124 | ||||
| -rwxr-xr-x | hudson-builds/promote-to-webstart.sh | 8 | ||||
| -rwxr-xr-x | hudson-builds/relocate-webstart-folder.sh | 4 | ||||
| -rwxr-xr-x | hudson-builds/test_something.sh | 4 |
6 files changed, 135 insertions, 66 deletions
diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh index 5b2a1dd..ec99b68 100755 --- a/deployment/funcs_jars_pack_sign.sh +++ b/deployment/funcs_jars_pack_sign.sh @@ -104,7 +104,7 @@ cd $wsdir rm -rf demo-jars mkdir -p demo-jars -mv jogl.test.jar jogl-demos*jar jocl-demos.jar demo-jars/ +mv jogl.test.jar demo-jars/ for i in *.jar ; do echo jarsigner -storetype pkcs12 -keystore $keystore $i \"$signarg\" diff --git a/deployment/funcs_jnlp_relocate.sh b/deployment/funcs_jnlp_relocate.sh index d529639..690078b 100755 --- a/deployment/funcs_jnlp_relocate.sh +++ b/deployment/funcs_jnlp_relocate.sh @@ -1,6 +1,6 @@ #! /bin/bash -function copy_relocate_jnlps() { +function copy_relocate_jnlps_base() { url=$1 shift @@ -38,12 +38,67 @@ for j in $jnlpdir/*.jnlp ; do sed -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \ -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \ -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \ - -e "s/DEMO_CODEBASE_TAG/$uri_esc/g" \ $j > $wsdir/$jb done } +function copy_relocate_jnlps_demos() { + +url=$1 +shift + +wsdir=$1 +shift + +demos_rel=$1 +shift + +if [ -z "$url" -o -z "$wsdir" -o -z "$demos_rel" ] ; then + echo usage $0 codebase-url webstartdir demos_rel + echo Examples + echo sh $0 file:////usr/local/projects/JOGL/webstart ../../webstart demos + echo sh $0 http://domain.org/jogl/webstart /srv/www/webstart-next demos + exit 1 +fi + +if [ ! -e $wsdir ] ; then + echo $wsdir does not exist + exit 1 +fi + +demos=$wsdir/$demos_rel + +if [ ! -e $demos ] ; then + echo $demos does not exist + exit 1 +fi + +url_demos=$url/$demos_rel +jnlpdir=$demos/jnlp-files + +if [ ! -e $jnlpdir ] ; then + echo $jnlpdir does not exist + exit 1 +fi + +cp -v $jnlpdir/*.html $demos + +uri_esc=`echo $url | sed 's/\//\\\\\//g'` +uri_demos_esc=`echo $url_demos | sed 's/\//\\\\\//g'` +for j in $jnlpdir/*.jnlp ; do + jb=`basename $j` + echo "processing $j to $demos/$jb" + + sed -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \ + -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \ + -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \ + -e "s/DEMO_CODEBASE_TAG/$uri_demos_esc/g" \ + $j > $demos/$jb +done + +} + function remove_security_tag_jnlps() { wsdir=$1 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 diff --git a/hudson-builds/promote-to-webstart.sh b/hudson-builds/promote-to-webstart.sh index 6c3dae0..2a66f55 100755 --- a/hudson-builds/promote-to-webstart.sh +++ b/hudson-builds/promote-to-webstart.sh @@ -83,6 +83,8 @@ function promote-webstart-jars() { # repack it .. so the signed jars can be pack200'ed # wsdir_jars_repack $wsdir +wsdir_jars_repack $wsdir/jogl-demos +wsdir_jars_repack $wsdir/jocl-demos # @@ -94,6 +96,8 @@ wsdir_jars_sign $wsdir $keystore $storepass $signarg # pack200 # wsdir_jars_pack200 $wsdir +wsdir_jars_pack200 $wsdir/jogl-demos +wsdir_jars_pack200 $wsdir/jocl-demos cp -av $logfile $wsdir @@ -103,7 +107,9 @@ echo_info 2>&1 | tee $logfile cp -a $abuild $wsdir 2>&1 | tee $logfile -copy_relocate_jnlps $url $wsdir 2>&1 | tee $logfile +copy_relocate_jnlps_base $url $wsdir 2>&1 | tee $logfile +copy_relocate_jnlps_demos $url $wsdir jogl-demos 2>&1 | tee $logfile +copy_relocate_jnlps_demos $url $wsdir jocl-demos 2>&1 | tee $logfile promote-webstart-jars 2>&1 | tee $logfile diff --git a/hudson-builds/relocate-webstart-folder.sh b/hudson-builds/relocate-webstart-folder.sh index affbb4e..d2a76ad 100755 --- a/hudson-builds/relocate-webstart-folder.sh +++ b/hudson-builds/relocate-webstart-folder.sh @@ -44,5 +44,7 @@ sdir=`dirname $0` cp -a $abuild $wsdir -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 diff --git a/hudson-builds/test_something.sh b/hudson-builds/test_something.sh index 7f20781..70c0f7b 100755 --- a/hudson-builds/test_something.sh +++ b/hudson-builds/test_something.sh @@ -7,6 +7,8 @@ sdir=`dirname $0` . $sdir/../deployment/funcs_jnlp_relocate.sh -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 remove_security_tag_jnlps $wsdir |