Fix promote-latest-builds ; Prep repack/sign/pack

3 files changed, 148 insertions, 50 deletions

diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh
index 6cd26c3..7ad4638 100755
--- a/hudson-builds/promote-latest-builds.sh
+++ b/hudson-builds/promote-latest-builds.sh
@@ -5,8 +5,21 @@
 # Will end up with an aggregated folder, webstart enabled,
 # but not pack200 compressed and not signed.
 #
+# promote-latest-builds.sh <branch-name> [secure]
+#
 ##
 
+branch=$1
+shift
+if [ ! -z "$1" ] ; then
+    option=$1
+    shift
+fi
+let secure=0
+if [ "$option" == "secure" ] ; then
+    let secure=1
+fi
+
 sdir=`dirname $0`
 
 thisdir=`pwd`
@@ -16,8 +29,8 @@ logfile=$thisdir/`basename $0 .sh`.log
 . $sdir/funcs_promotion.sh
 . $sdir/../deployment/funcs_jnlp_relocate.sh
 
-archivedir=/srv/www/jogamp.org/deployment/archive
-rootdir=/srv/www/jogamp.org/deployment/autobuilds
+archivedir=/srv/www/jogamp.org/deployment/archive/$branch
+rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
 
 os_and_archs_minus_one="linux-i586 macosx-universal windows-amd64 windows-i586"
 masterpick="linux-amd64"
@@ -30,12 +43,15 @@ cd $rootdir
 function promote-latest-builds() {
     echo
     echo "Promotion of latest files"
+    echo
+    echo "  branch: $branch"
+    echo "  option: $option"
+    echo "    secure: $secure"
+    echo
     echo `date`
     echo
     prom_setup $rootdir $dest
 
-    mkdir $dest/javadoc
-
     gluegenslave=`prom_lslatest gluegen-b`
     bgluegenslave=`prom_buildnumber_2 $gluegenslave`
     gluegenmaster=`prom_lslatest gluegen-master-b`
@@ -77,24 +93,28 @@ function promote-latest-builds() {
     unzip -q ../jogl-javadoc.zip
     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=$bjogldemosmaster" >> $dest/aggregated.artifact.properties
+    echo "jogl-demos.build.number=$bjogldemosslave" >> $dest/aggregated.artifact.properties
 
     cp -a $jogldemosmaster/jogl-demos*.zip $dest/
-    cp -a $jogldemosmaster/artifact.properties $dest/jogl-demos.artifact.properties
+    cp -a $jogldemosmaster/artifact.properties $dest/jogl-demos-master.artifact.properties
+    cp -a $jogldemosslave/artifact.properties $dest/jogl-demos.artifact.properties
     cd $dest
 
     fname=`find . -name jogl-demos*.zip`
     bname=`basename $fname .zip`
     echo "INFO: unzip $fname -> $bname"
     unzip -q $bname.zip
-    prom_verify_artifacts jogl-demos jogl-demos.artifact.properties $bname/artifact.properties
+    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/
@@ -105,52 +125,61 @@ function promote-latest-builds() {
     ####### FIXME : JOCL, adapt to the new archive structure 
     #########################################################
 
-    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
+##    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
+##
 
-    cp -a $jocldemosslave/jocl-demos*jar $dest/
-    cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
+    #########################################################
+    ## Integrity Check, Cleanup, aggregation.properties
+    #########################################################
 
     prom_integrity_check $dest
 
     prom_cleanup $dest
 
-    uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-    url=http://jogamp.org/deployment/archive/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-    wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+#    uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+#    url=http://jogamp.org/deployment/archive/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/gluegen_$bgluegenslave-jogl_$bjoglslave
+    wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave
 
     rm -rf $wsdir
     mv $dest $wsdir
@@ -160,13 +189,18 @@ 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
+    #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
     sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
-    diff -Nurbw aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
+    diff -Nurbw aggregated.artifact.properties.sorted jogl-demos.artifact.properties.sorted
 
     copy_relocate_jnlps $url $wsdir
 
-    remove_security_tag_jnlps $wsdir
+    if [ $secure -ne 1 ] ; then
+        remove_security_tag_jnlps $wsdir
+    fi
 
     echo
     echo Aggregation folder $wsdir for URL $url
diff --git a/hudson-builds/promote-webstart-jars.sh b/hudson-builds/promote-webstart-jars.sh
new file mode 100755
index 0000000..541192c
--- /dev/null
+++ b/hudson-builds/promote-webstart-jars.sh
@@ -0,0 +1,64 @@
+#! /bin/bash
+
+##
+#
+# Will modify all non jar file in the aggregated webstart folder.
+#   - repack
+#   - sign
+#   - pack200
+#
+# promote-webstart-jars.sh <wsdir> <pkcs12-keystore> <storepass> [signarg]
+#
+##
+
+wsdir=$1
+shift
+
+keystore=$1
+shift
+
+storepass=$1
+shift
+
+signarg=$1
+shift
+
+if [ -z "$wsdir" -o -z "$keystore" -o -z "$storepass" ] ; then
+    echo "usage $0 webstartdir pkcs12-keystore storepass [signarg]"
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+if [ ! -e $keystore ] ; then
+    echo $keystore does not exist
+    exit 1
+fi
+
+sdir=`dirname $0`
+
+thisdir=`pwd`
+
+logfile=$thisdir/`basename $0 .sh`.log
+
+. $sdir/../deployment/funcs_jars_pack_sign.sh
+
+#
+# repack it .. so the signed jars can be pack200'ed
+#
+wsdir_jars_repack  $wsdir
+
+
+#
+# sign it
+#
+wsdir_jars_sign    $wsdir $keystore $storepass $signarg
+
+#
+# pack200
+#
+wsdir_jars_pack200 $wsdir
+
diff --git a/hudson-builds/promote-webstarte-next.sh b/hudson-builds/promote-webstart-next.sh
index 7b6b2ed..7b6b2ed 100755
--- a/hudson-builds/promote-webstarte-next.sh
+++ b/hudson-builds/promote-webstart-next.sh