From 162ba12b22dc5520f99b99868b07941a6f4845c1 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 27 Feb 2011 23:37:58 +0100
Subject: javadoc: extract only the expected module's folder

---
 hudson-builds/funcs_promotion.sh       | 6 +++---
 hudson-builds/promote-latest-builds.sh | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'hudson-builds')

diff --git a/hudson-builds/funcs_promotion.sh b/hudson-builds/funcs_promotion.sh
index 6a2427e..44be6ae 100755
--- a/hudson-builds/funcs_promotion.sh
+++ b/hudson-builds/funcs_promotion.sh
@@ -141,11 +141,11 @@ function prom_extract() {
     shift
 
     local OK=0
-    7z x $zfile && OK=1
+    7z x $zfile $* && OK=1
     if [ $OK -eq 0 ] ; then
-        echo ERROR in 7z file $zfile
+        echo ERROR in 7z file $zfile $*
     else
-        echo OK 7z file $zfile
+        echo OK 7z file $zfile $*
     fi
 }
 
diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh
index b6fc1fa..1079c70 100755
--- a/hudson-builds/promote-latest-builds.sh
+++ b/hudson-builds/promote-latest-builds.sh
@@ -72,7 +72,7 @@ function promote-latest-builds() {
     cp -a $gluegenmaster/javadoc.7z $dest/gluegen-javadoc.7z
     cd $dest/javadoc
     echo "INFO: gluegen master gluegen-javadoc 7z"
-    prom_extract ../gluegen-javadoc.7z
+    prom_extract ../gluegen-javadoc.7z gluegen
     cd $rootdir
 
     joalslave=`prom_lslatest joal-b`
@@ -88,7 +88,7 @@ function promote-latest-builds() {
     
     cp -a $joalslave/javadoc.7z $dest/joal-javadoc.7z
     cd $dest/javadoc
-    prom_extract ../joal-javadoc.7z
+    prom_extract ../joal-javadoc.7z joal
     cd $rootdir
 
     joaldemosslave=`prom_lslatest joal-demos-b`
@@ -134,7 +134,7 @@ function promote-latest-builds() {
     cp -a $joglmaster/artifact.properties $dest/javadoc/jogl-master.artifact.properties
     cp -a $joglmaster/javadoc.7z $dest/jogl-javadoc.7z
     cd $dest/javadoc
-    prom_extract ../jogl-javadoc.7z
+    prom_extract ../jogl-javadoc.7z jogl
     cd $rootdir
 
     jogldemosslave=`prom_lslatest jogl-demos-b`
@@ -184,7 +184,7 @@ function promote-latest-builds() {
     cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties
     cp -a $joclmaster/jocl-javadoc.7z $dest/jocl-javadoc.7z
     cd $dest/javadoc
-    prom_extract ../jocl-javadoc.7z
+    prom_extract ../jocl-javadoc.7z jocl
     cd $rootdir
 
     jocldemosslave=`prom_lslatest jocl-demos-b`
-- 
cgit v1.2.3