diff options
| -rwxr-xr-x | deployment/funcs_jnlp_relocate.sh | 24 | ||||
| -rwxr-xr-x | hudson-builds/promote-latest-builds.sh | 11 | ||||
| -rwxr-xr-x | hudson-builds/promote-to-webstart.sh | 23 | ||||
| -rwxr-xr-x | hudson-builds/relocate-webstart-folder.sh | 19 | ||||
| -rwxr-xr-x | hudson-builds/test_something.sh | 8 |
5 files changed, 55 insertions, 30 deletions
diff --git a/deployment/funcs_jnlp_relocate.sh b/deployment/funcs_jnlp_relocate.sh index 4b4f8ba..192e249 100755 --- a/deployment/funcs_jnlp_relocate.sh +++ b/deployment/funcs_jnlp_relocate.sh @@ -2,17 +2,20 @@ function copy_relocate_jnlps_base() { +local version=$1 +shift + local url=$1 shift local wsdir=$1 shift -if [ -z "$url" -o -z "$wsdir" ] ; then - echo usage $0 codebase-url webstartdir +if [ -z "$version" -o -z "$url" -o -z "$wsdir" ] ; then + echo usage $0 version codebase-url webstartdir echo Examples - echo sh $0 file:////usr/local/projects/JOGL/webstart ../../webstart - echo sh $0 http://domain.org/jogl/webstart /srv/www/webstart-next + echo sh $0 v2.0-rc2 file:////usr/local/projects/JOGL/webstart ../../webstart + echo sh $0 v2.0-rc2 http://domain.org/jogl/webstart /srv/www/webstart-next exit 1 fi @@ -36,6 +39,7 @@ for j in $jnlpdir/*.jnlp ; do echo "processing $j to $wsdir/$jb" sed \ + -e "s/JOGAMP_VERSION/$version/g" \ -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \ -e "s/JOAL_CODEBASE_TAG/$uri_esc/g" \ -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \ @@ -47,6 +51,9 @@ done function copy_relocate_jnlps_demos() { +local version=$1 +shift + local url=$1 shift @@ -56,11 +63,11 @@ shift local demos_rel=$1 shift -if [ -z "$url" -o -z "$wsdir" -o -z "$demos_rel" ] ; then - echo usage $0 codebase-url webstartdir demos_rel +if [ -z "$version" -o -z "$url" -o -z "$wsdir" -o -z "$demos_rel" ] ; then + echo usage $0 version 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 + echo sh $0 v2.0-rc2 file:////usr/local/projects/JOGL/webstart ../../webstart demos + echo sh $0 v2.0-rc2 http://domain.org/jogl/webstart /srv/www/webstart-next demos exit 1 fi @@ -93,6 +100,7 @@ for j in $jnlpdir/*.jnlp ; do echo "processing $j to $demos/$jb" sed \ + -e "s/JOGAMP_VERSION/$version/g" \ -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \ -e "s/JOAL_CODEBASE_TAG/$uri_esc/g" \ -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \ diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh index 3e0ce92..f9c726c 100755 --- a/hudson-builds/promote-latest-builds.sh +++ b/hudson-builds/promote-latest-builds.sh @@ -20,6 +20,8 @@ if [ "$option" == "secure" ] ; then let secure=1 fi +version=autobuild + sdir=`dirname $0` thisdir=`pwd` @@ -213,6 +215,7 @@ function promote-latest-builds() { ######################################################### prom_integrity_check $dest + prom_integrity_check $dest/joal-demos prom_integrity_check $dest/jogl-demos prom_integrity_check $dest/jocl-demos @@ -251,10 +254,10 @@ function promote-latest-builds() { diff -Nurbw aggregated.artifact.properties.sorted all.artifact.properties.sorted | tee all.artifact.properties.diff - copy_relocate_jnlps_base $url $wsdir - copy_relocate_jnlps_demos $url $wsdir joal-demos - copy_relocate_jnlps_demos $url $wsdir jogl-demos - copy_relocate_jnlps_demos $url $wsdir jocl-demos + copy_relocate_jnlps_base $version $url $wsdir + copy_relocate_jnlps_demos $version $url $wsdir joal-demos + copy_relocate_jnlps_demos $version $url $wsdir jogl-demos + copy_relocate_jnlps_demos $version $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 2a66f55..9ae2a1b 100755 --- a/hudson-builds/promote-to-webstart.sh +++ b/hudson-builds/promote-to-webstart.sh @@ -4,14 +4,15 @@ # # Will promote an aggregated/archived folder to a webstart folder. # - copy adir -> wsdir -# - filters jnlp files (url) +# - filters jnlp files (url and version) # - repack # - sign # - pack200 # -# promote-to-webstart.sh <adir> <wsdir> <url> <pkcs12-keystore> <storepass> [signarg] +# promote-to-webstart.sh <version> <adir> <wsdir> <url> <pkcs12-keystore> <storepass> [signarg] # eg. -# promote-to-webstart.sh /srv/www/deployment/b3 \ +# promote-to-webstart.sh v2.0-rc2 \ +# /srv/www/deployment/b3 \ # /srv/www/deployment/webstart-b3 \ # http://lala.lu/webstart-b3 \ # secret.p12 \ @@ -20,6 +21,9 @@ # ## +version=$1 +shift + abuild=$1 shift @@ -37,8 +41,8 @@ shift signarg="$*" -if [ -z "$abuild" -o -z "$wsdir" -o -z "$url" -o -z "$keystore" -o -z "$storepass" ] ; then - echo "usage $0 abuilddir webstartdir url pkcs12-keystore storepass [signarg]" +if [ -z "$version" -o -z "$abuild" -o -z "$wsdir" -o -z "$url" -o -z "$keystore" -o -z "$storepass" ] ; then + echo "usage $0 version abuilddir webstartdir url pkcs12-keystore storepass [signarg]" exit 1 fi @@ -83,6 +87,7 @@ function promote-webstart-jars() { # repack it .. so the signed jars can be pack200'ed # wsdir_jars_repack $wsdir +wsdir_jars_repack $wsdir/joal-demos wsdir_jars_repack $wsdir/jogl-demos wsdir_jars_repack $wsdir/jocl-demos @@ -96,6 +101,7 @@ wsdir_jars_sign $wsdir $keystore $storepass $signarg # pack200 # wsdir_jars_pack200 $wsdir +wsdir_jars_pack200 $wsdir/joal-demos wsdir_jars_pack200 $wsdir/jogl-demos wsdir_jars_pack200 $wsdir/jocl-demos @@ -107,9 +113,10 @@ echo_info 2>&1 | tee $logfile cp -a $abuild $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 +copy_relocate_jnlps_base $version $url $wsdir 2>&1 | tee $logfile +copy_relocate_jnlps_demos $version $url $wsdir joal-demos 2>&1 | tee $logfile +copy_relocate_jnlps_demos $version $url $wsdir jogl-demos 2>&1 | tee $logfile +copy_relocate_jnlps_demos $version $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 d2a76ad..367c289 100755 --- a/hudson-builds/relocate-webstart-folder.sh +++ b/hudson-builds/relocate-webstart-folder.sh @@ -6,14 +6,18 @@ # - copy wsdir1 -> wsdir2 # - filters jnlp files (url) # -# relocate-webstart-folder.sh <wsdir1> <wsdir2> <url> +# relocate-webstart-folder.sh <version> <wsdir1> <wsdir2> <url> # eg. -# relocate-webstart-folder.sh /srv/www/deployment/webstart-b3 \ +# relocate-webstart-folder.sh v2.0-rc2 \ +# /srv/www/deployment/webstart-b3 \ # /srv/www/deployment/webstart-next \ # http://lala.lu/webstart-next # ## +version=$1 +shift + abuild=$1 shift @@ -23,8 +27,8 @@ shift url=$1 shift -if [ -z "$abuild" -o -z "$wsdir" -o -z "$url" ] ; then - echo "usage $0 abuilddir webstartdir url" +if [ -z "$version" -o -z "$abuild" -o -z "$wsdir" -o -z "$url" ] ; then + echo "usage $0 version abuilddir webstartdir url" exit 1 fi @@ -44,7 +48,8 @@ sdir=`dirname $0` cp -a $abuild $wsdir -copy_relocate_jnlps_base $url $wsdir -copy_relocate_jnlps_demos $url $wsdir jogl-demos -copy_relocate_jnlps_demos $url $wsdir jocl-demos +copy_relocate_jnlps_base $version $url $wsdir +copy_relocate_jnlps_demos $version $url $wsdir joal-demos +copy_relocate_jnlps_demos $version $url $wsdir jogl-demos +copy_relocate_jnlps_demos $version $url $wsdir jocl-demos diff --git a/hudson-builds/test_something.sh b/hudson-builds/test_something.sh index 70c0f7b..b635eb6 100755 --- a/hudson-builds/test_something.sh +++ b/hudson-builds/test_something.sh @@ -1,5 +1,6 @@ #! /bin/bash +version=v2.0-rc2 wsdir=/srv/www/jogamp.org/deployment/archive/gluegen_195-jogl_203-jocl_200 url=http://jogamp.org/deployment/archive/gluegen_195-jogl_203-jocl_200 @@ -7,8 +8,9 @@ sdir=`dirname $0` . $sdir/../deployment/funcs_jnlp_relocate.sh -copy_relocate_jnlps_base $url $wsdir -copy_relocate_jnlps_demos $url $wsdir jogl-demos -copy_relocate_jnlps_demos $url $wsdir jocl-demos +copy_relocate_jnlps_base $version $url $wsdir +copy_relocate_jnlps_demos $version $url $wsdir joal-demos +copy_relocate_jnlps_demos $version $url $wsdir jogl-demos +copy_relocate_jnlps_demos $version $url $wsdir jocl-demos remove_security_tag_jnlps $wsdir |