Fix demo jar files ; Use archive subfolder to contain orig ZIP files

2 files changed, 4 insertions, 2 deletions

diff --git a/hudson-builds/funcs_promotion.sh b/hudson-builds/funcs_promotion.sh
index c2211d9..0943a0c 100755
--- a/hudson-builds/funcs_promotion.sh
+++ b/hudson-builds/funcs_promotion.sh
@@ -14,6 +14,7 @@ function prom_setup() {
     mkdir $ldest
     mkdir $ldest/javadoc
     mkdir $ldest/jnlp-files
+    mkdir $ldest/archive
 
     cd $lthisdir
 }
@@ -151,6 +152,7 @@ function prom_cleanup() {
             fi
         done
     done
+    mv *.zip archive/
     cd $lthisdir
 }
 
diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh
index e840051..0047484 100755
--- a/hudson-builds/promote-latest-builds.sh
+++ b/hudson-builds/promote-latest-builds.sh
@@ -117,7 +117,7 @@ function promote-latest-builds() {
     echo "INFO: unzip $fname -> $bname"
     unzip -q ../$bname.zip
     prom_verify_artifacts jogl-demos ../jogl-demos-master.artifact.properties $bname/artifact.properties
-    mv $bname/jar .
+    mv $bname/jar/* .
     mv $bname/jnlp-files .
     mv $bname/www .
     echo "INFO: delete folder $bname"
@@ -168,7 +168,7 @@ function promote-latest-builds() {
     echo "INFO: unzip $fname -> $bname"
     unzip -q ../$bname.zip
     prom_verify_artifacts jocl-demos ../jocl-demos-master.artifact.properties $bname/artifact.properties
-    mv $bname/jar .
+    mv $bname/jar/* .
     mv $bname/jnlp-files .
     mv $bname/www .
     echo "INFO: delete folder $bname"