Replace tags in html files as well; Use env var JOGAMP_DEPLOYMENT_NO_REPACK to avoid pack200 (local test time)

2 files changed, 10 insertions, 10 deletions

diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh
index 1e5dfd4..364c3d8 100755
--- a/deployment/funcs_jars_pack_sign.sh
+++ b/deployment/funcs_jars_pack_sign.sh
@@ -25,10 +25,12 @@ local THISDIR=`pwd`
 
 cd $wsdir
 
-for i in *.jar ; do
+if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+  for i in *.jar ; do
     echo pack200 --repack $i
     pack200 --repack $i
-done
+  done
+fi
 
 cd $THISDIR
 
@@ -56,12 +58,14 @@ cd $wsdir
 mkdir -p DLLS
 mv *natives*.jar DLLS/
 
-for i in *.jar ; do
+if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+  for i in *.jar ; do
     echo gzip -9 $i to $i.gz
     gzip -9 -cv $i > $i.gz
     echo pack200 -E9 $i.pack.gz $i
     pack200 -E9 $i.pack.gz $i
-done
+  done
+fi
 
 mv DLLS/* .
 
diff --git a/deployment/funcs_jnlp_relocate.sh b/deployment/funcs_jnlp_relocate.sh
index 192e249..4177af5 100755
--- a/deployment/funcs_jnlp_relocate.sh
+++ b/deployment/funcs_jnlp_relocate.sh
@@ -31,10 +31,8 @@ if [ ! -e $jnlpdir ] ; then
     exit 1
 fi
 
-cp -v $jnlpdir/*.html $wsdir
-
 local uri_esc=`echo $url | sed 's/\//\\\\\//g'`
-for j in $jnlpdir/*.jnlp ; do
+for j in $jnlpdir/*.jnlp $jnlpdir/*.html ; do
     local jb=`basename $j`
     echo "processing $j to $wsdir/$jb"
 
@@ -91,11 +89,9 @@ if [ ! -e $jnlpdir ] ; then
     exit 1
 fi
 
-cp -v $jnlpdir/*.html $demos
-
 local uri_esc=`echo $url | sed 's/\//\\\\\//g'`
 local uri_demos_esc=`echo $url_demos | sed 's/\//\\\\\//g'`
-for j in $jnlpdir/*.jnlp ; do
+for j in $jnlpdir/*.jnlp $jnlpdir/*.html ; do
     local jb=`basename $j`
     echo "processing $j to $demos/$jb"