From 20c89e865adf4b7f36b654bc48dafc7a83af115a Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 13 Sep 2011 06:52:33 +0200
Subject: New Deployment Filesystem Hierarchy Standard (D FHS) - Using
 subfolders to cleanup

---
 deployment/deploy-jars-webstarttest.sh | 12 ++++++------
 deployment/funcs_jars_pack_sign.sh     | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'deployment')

diff --git a/deployment/deploy-jars-webstarttest.sh b/deployment/deploy-jars-webstarttest.sh
index 8a98f5d..4c3a841 100755
--- a/deployment/deploy-jars-webstarttest.sh
+++ b/deployment/deploy-jars-webstarttest.sh
@@ -11,13 +11,13 @@ if [ -z "$joglbuilddir" -o -z "$wsdir" ] ; then
     exit 1
 fi
 
-if [ ! -e $joglbuilddir ] ; then
-    echo $joglbuilddir does not exist
+if [ ! -e $joglbuilddir/jar ] ; then
+    echo $joglbuilddir/jar does not exist
     exit 1
 fi
 
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
+if [ ! -e $wsdir/jar ] ; then
+    echo $wsdir/jar does not exist
     exit 1
 fi
 
@@ -45,6 +45,6 @@ if [ ! -e $jnlpdir_demos ] ; then
     exit 1
 fi
 
-cp -v $joglbuilddir/jar/*.jar $wsdir
-cp -v $demosroot/$builddirbase/*.jar $wsdir
+cp -v $joglbuilddir/jar/*.jar $wsdir/jar/
+cp -v $demosroot/$builddirbase/*.jar $wsdir/jogl-demos/
 
diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh
index 364c3d8..8817575 100755
--- a/deployment/funcs_jars_pack_sign.sh
+++ b/deployment/funcs_jars_pack_sign.sh
@@ -16,14 +16,17 @@ if [ -z "$wsdir" ] ; then
     exit 1
 fi
 
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
+if [ ! -e $wsdir/jar ] ; then
+    echo $wsdir/jar does not exist
     exit 1
 fi
 
 local THISDIR=`pwd`
 
-cd $wsdir
+cd $wsdir/jar
+
+mkdir orig
+cp -a *jar orig/
 
 if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
   for i in *.jar ; do
@@ -46,14 +49,14 @@ if [ -z "$wsdir" ] ; then
     exit 1
 fi
 
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
+if [ ! -e $wsdir/jar ] ; then
+    echo $wsdir/jar does not exist
     exit 1
 fi
 
 local THISDIR=`pwd`
 
-cd $wsdir
+cd $wsdir/jar
 
 mkdir -p DLLS
 mv *natives*.jar DLLS/
@@ -68,7 +71,6 @@ if [ -z "$JOGAMP_DEPLOYMENT_NO_REPACK" ] ; then
 fi
 
 mv DLLS/* .
-
 rm -rf DLLS
 
 cd $THISDIR
@@ -94,8 +96,8 @@ if [ -z "$wsdir" -o -z "$keystore" -o -z "$storepass" ] ; then
     exit 1
 fi
 
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
+if [ ! -e $wsdir/jar ] ; then
+    echo $wsdir/jar does not exist
     exit 1
 fi
 
@@ -106,7 +108,7 @@ fi
 
 local THISDIR=`pwd`
 
-cd $wsdir
+cd $wsdir/jar
 
 rm -rf demo-jars
 mkdir -p demo-jars
-- 
cgit v1.2.3