Prep repack/sign/pack (2)

5 files changed, 155 insertions, 83 deletions

diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh
index fbfd4fa..deff4a9 100755
--- a/deployment/funcs_jars_pack_sign.sh
+++ b/deployment/funcs_jars_pack_sign.sh
@@ -25,11 +25,7 @@ THISDIR=`pwd`
 
 cd $wsdir
 
-rm -rf orig-jars
-mkdir -p orig-jars
-
 for i in *.jar ; do
-    cp -a $i orig-jars
     echo pack200 --repack $i
     pack200 --repack $i
 done
@@ -113,7 +109,7 @@ mv jogl.test.jar jogl-demos*jar jocl-demos.jar demo-jars/
 
 for i in *.jar ; do
     echo jarsigner -storetype pkcs12 -keystore $keystore $i \"$signarg\"
-    jarsigner -storetype pkcs12 -keystore $THISDIR/$keystore -storepass $storepass $i "$signarg"
+    jarsigner -storetype pkcs12 -keystore $keystore -storepass $storepass $i "$signarg"
 done
 
 mv demo-jars/* .
diff --git a/hudson-builds/promote-to-webstart.sh b/hudson-builds/promote-to-webstart.sh
new file mode 100755
index 0000000..508c52d
--- /dev/null
+++ b/hudson-builds/promote-to-webstart.sh
@@ -0,0 +1,106 @@
+#! /bin/bash
+
+##
+#
+# Will promote an aggregated/archived folder to a webstart folder.
+#   - copy adir -> wsdir
+#   - filters jnlp files (url)
+#   - repack
+#   - sign
+#   - pack200
+#
+# promote-to-webstart.sh <adir> <wsdir> <url> <pkcs12-keystore> <storepass> [signarg]
+# eg.
+#   promote-to-webstart.sh /srv/www/deployment/b3 \
+#                          /srv/www/deployment/webstart-b3 \
+#                          http://lala.lu/webstart-b3 \
+#                          secret.p12 \
+#                          PassWord "something"
+#
+##
+
+abuild=$1
+shift
+
+wsdir=$1
+shift
+
+url=$1
+shift
+
+keystore=$1
+shift
+
+storepass=$1
+shift
+
+signarg=$1
+shift
+
+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]"
+    exit 1
+fi
+
+if [ ! -e $abuild ] ; then
+    echo $abuild does not exist
+    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_jnlp_relocate.sh
+. $sdir/../deployment/funcs_jars_pack_sign.sh
+
+function promote-webstart-jars() {
+    echo
+    echo "Promotion of latest files"
+    echo
+    echo "  branch: $branch"
+    echo "  option: $option"
+    echo "    secure: $secure"
+    echo
+    echo `date`
+    echo
+    prom_setup $rootdir $dest
+
+#
+# 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
+
+cp -av $logfile $wsdir
+
+}
+
+cp -a $abuild $wsdir 2>&1 | tee $logfile
+
+copy_relocate_jnlps $url $wsdir 2>&1 | tee $logfile
+
+promote-webstart-next 2>&1 | tee $logfile
+
diff --git a/hudson-builds/promote-webstart-jars.sh b/hudson-builds/promote-webstart-jars.sh
deleted file mode 100755
index 541192c..0000000
--- a/hudson-builds/promote-webstart-jars.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /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-webstart-next.sh b/hudson-builds/promote-webstart-next.sh
deleted file mode 100755
index 7b6b2ed..0000000
--- a/hudson-builds/promote-webstart-next.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-abuild=/srv/www/jogamp.org/deployment/archive/gluegen_195-jogl_203-jocl_200
-wsdir=/srv/www/jogamp.org/deployment/webstart-next
-url=http://jogamp.org/deployment/webstart-next
-
-sdir=`dirname $0`
-
-. $sdir/../deployment/funcs_jnlp_relocate.sh
-
-cp -a $abuild $wsdir
-
-copy_relocate_jnlps $url $wsdir
-
diff --git a/hudson-builds/relocate-webstart-folder.sh b/hudson-builds/relocate-webstart-folder.sh
new file mode 100755
index 0000000..359ac92
--- /dev/null
+++ b/hudson-builds/relocate-webstart-folder.sh
@@ -0,0 +1,48 @@
+#! /bin/bash
+
+##
+#
+# Will relocate a webstart folder.
+#   - copy wsdir1 -> wsdir2
+#   - filters jnlp files (url)
+#
+# relocate-webstart-folder.sh <wsdir1> <wsdir2> <url>
+# eg.
+#   relocate-webstart-folder.sh /srv/www/deployment/webstart-b3 \
+#                               /srv/www/deployment/webstart-next \
+#                               http://lala.lu/webstart-next 
+#
+##
+
+abuild=$1
+shift
+
+wsdir=$1
+shift
+
+url=$1
+shift
+
+if [ -z "$abuild" -o -z "$wsdir" -o -z "$url" ] ; then
+    echo "usage $0 abuilddir webstartdir url"
+    exit 1
+fi
+
+if [ ! -e $abuild ] ; then
+    echo $abuild does not exist
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+sdir=`dirname $0`
+
+. $sdir/../deployment/funcs_jnlp_relocate.sh
+
+cp -a $abuild $wsdir
+
+copy_relocate_jnlps $url $wsdir
+