New FHS - Add processing of jar/jnlp atomic subfolder; jnlp file exist check; Add prom_promote_demos

2 files changed, 78 insertions, 32 deletions

diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh
index 8817575..9406ca1 100755
--- a/deployment/funcs_jars_pack_sign.sh
+++ b/deployment/funcs_jars_pack_sign.sh
@@ -25,16 +25,30 @@ local THISDIR=`pwd`
 
 cd $wsdir/jar
 
-mkdir orig
-cp -a *jar orig/
-
 if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+  mkdir orig
+  cp -a *jar orig/
+
   for i in *.jar ; do
     echo pack200 --repack $i
     pack200 --repack $i
   done
 fi
 
+if [ -e atomic ] ; then
+    cd atomic
+    if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+      mkdir orig
+      cp -a *jar orig/
+
+      for i in *.jar ; do
+        echo pack200 --repack $i
+        pack200 --repack $i
+      done
+    fi
+
+fi
+
 cd $THISDIR
 
 }
@@ -58,20 +72,38 @@ local THISDIR=`pwd`
 
 cd $wsdir/jar
 
-mkdir -p DLLS
-mv *natives*.jar DLLS/
-
 if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+  mkdir -p DLLS
+  mv *natives*.jar DLLS/
+
   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
+
+  mv DLLS/* .
+  rm -rf DLLS
 fi
 
-mv DLLS/* .
-rm -rf DLLS
+if [ -e atomic ] ; then
+    cd atomic
+    if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
+      mkdir -p DLLS
+      mv *natives*.jar DLLS/
+
+      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
+
+      mv DLLS/* .
+      rm -rf DLLS
+    fi
+fi
 
 cd $THISDIR
 
@@ -122,6 +154,14 @@ done
 mv demo-jars/* .
 rm -rf demo-jars
 
+if [ -e atomic ] ; then
+    cd atomic
+    for i in *.jar ; do
+        echo jarsigner -storetype pkcs12 -keystore $keystore $i \"$signarg\"
+        jarsigner -storetype pkcs12 -keystore $keystore -storepass $storepass $i "$signarg"
+    done
+fi
+
 cd $THISDIR
 
 }
diff --git a/deployment/funcs_jnlp_relocate.sh b/deployment/funcs_jnlp_relocate.sh
index 4177af5..60a40b0 100755
--- a/deployment/funcs_jnlp_relocate.sh
+++ b/deployment/funcs_jnlp_relocate.sh
@@ -32,17 +32,19 @@ if [ ! -e $jnlpdir ] ; then
 fi
 
 local uri_esc=`echo $url | sed 's/\//\\\\\//g'`
-for j in $jnlpdir/*.jnlp $jnlpdir/*.html ; do
-    local jb=`basename $j`
-    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" \
-        -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \
-        $j > $wsdir/$jb
+for j in $jnlpdir/*.jnlp $jnlpdir/atomic/*.jnlp $jnlpdir/*.html ; do
+    if [ -e $j ] ; then
+        local jb=`basename $j`
+        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" \
+            -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \
+            $j > $wsdir/$jb
+    fi
 done
 
 }
@@ -91,18 +93,20 @@ fi
 
 local uri_esc=`echo $url | sed 's/\//\\\\\//g'`
 local uri_demos_esc=`echo $url_demos | sed 's/\//\\\\\//g'`
-for j in $jnlpdir/*.jnlp $jnlpdir/*.html ; do
-    local jb=`basename $j`
-    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" \
-        -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \
-        -e "s/DEMO_CODEBASE_TAG/$uri_demos_esc/g" \
-        $j > $demos/$jb
+for j in $jnlpdir/*.jnlp $jnlpdir/atomic/*.jnlp $jnlpdir/*.html ; do
+    if [ -e $j ] ; then
+        local jb=`basename $j`
+        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" \
+            -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \
+            -e "s/DEMO_CODEBASE_TAG/$uri_demos_esc/g" \
+            $j > $demos/$jb
+    fi
 done
 
 }
@@ -125,7 +129,9 @@ fi
 cd $wsdir
 
 for i in *.jnlp ; do
-    sed -i -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' $i
+    if [ -e $i ] ; then
+        sed -i -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' $i
+    fi
 done
 
 }