Author: psteitz
Date: Sun Jul  9 12:39:15 2006
New Revision: 420335

URL: http://svn.apache.org/viewvc?rev=420335&view=rev
Log:
Changed maven build to override maven.final.name to eliminate name-munging
Added scp commands to manually deploy dated snaps for maven components

Modified:
    jakarta/commons/proper/commons-build/trunk/commons_nightly.sh

Modified: jakarta/commons/proper/commons-build/trunk/commons_nightly.sh
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/commons-build/trunk/commons_nightly.sh?rev=420335&r1=420334&r2=420335&view=diff
==============================================================================
--- jakarta/commons/proper/commons-build/trunk/commons_nightly.sh (original)
+++ jakarta/commons/proper/commons-build/trunk/commons_nightly.sh Sun Jul  9 
12:39:15 2006
@@ -11,7 +11,10 @@
 # Uses scp to upload resulting .zip and .tar.gz files to
 # [EMAIL PROTECTED]:$deploy_location/commons-$component
 #
-# Names are munged to take the form 
+# Deploys dated snapshot jars for the maven components to
+# $maven_snapshot_host:$maven_snapshot_directory
+#
+# Names of distro files take the form 
 # commons-$component-src-$time_stamp (source)
 # commons-$component-$time_stamp (binaries)
 #
@@ -37,6 +40,8 @@
 log_location="/home/psteitz/log"              # where to put logs
 time_stamp=`date +%Y%m%d`                     # time stamp in file names
 ant_build="/home/psteitz/build"               # Ant build directory
+maven_snapshot_host=people.apache.org         # Maven snapshot host
+maven_snapshot_directory=/www/people.apache.org/repository
 #==============================================================================
 # Process maven components in $components list.
 # Assumes $components are checked out with common root, $current_root
@@ -53,16 +58,32 @@
     echo
     echo "Using Maven to build $component...."
     svn up
-    maven clean dist > $log_location/$component.log 2>&1 
-    rename "s/m-target/target/" *                       # validator funniness
-    rename "s/SNAPSHOT/$time_stamp/" target/distributions/*
-    rename "s/RC1/$time_stamp/" target/distributions/*  # scxml - branch?
+
+    # Create distro, overriding version name with timestamp
+    maven -Dmaven.final.name=commons-$component-$time_stamp \
+    clean dist > $log_location/$component.log 2>&1 
+
+    # Deploy source and binary distro to commons nightly location
     ssh $deploy_host mkdir -p $deploy_location/commons-$component
     scp target/distributions/commons-$component*.gz \
     [EMAIL PROTECTED]:$deploy_location/commons-$component
     scp target/distributions/commons-$component*.zip \
     [EMAIL PROTECTED]:$deploy_location/commons-$component
-    rm -rf target                                       # cleanup validator
+    scp target/distributions/commons-$component*.md5 \
+    [EMAIL PROTECTED]:$deploy_location/commons-$component
+
+    # Deploy dated jar manually to maven 1 snapshot repo
+    ssh $maven_snapshot_host mkdir -p 
${maven_snapshot_directory}/commons-$component/jars
+    md5sum -b target/commons-$component-$time_stamp.jar > \
+    target/commons-$component-$time_stamp.jar.md5
+    scp target/commons-$component-$time_stamp.jar \
+    [EMAIL PROTECTED]:${maven_snapshot_directory}/commons-$component/jars
+    scp target/commons-$component-$time_stamp.jar.md5 \
+    [EMAIL PROTECTED]:${maven_snapshot_directory}/commons-$component/jars
+    ssh $maven_snapshot_host chmod -R g+w 
${maven_snapshot_directory}/commons-$component
+
+    # Cleanup
+    rm -rf target                                      
   done 
 } 
 #==============================================================================
@@ -94,7 +115,6 @@
     rm clean.sh
     cd ${ant_build}
     tar -czf commons-$component-src-$time_stamp.tar.gz commons-$component-src
-    # FIXME (or vmbuild) Ubuntu does not seem to have zip?? Next line fails...
     zip -q -r commons-$component-src-$time_stamp.zip commons-$component-src
     mv commons-$component-src-$time_stamp.* ${ant_build}/commons-$component-src
 
@@ -103,7 +123,6 @@
     ant dist > $log_location/$component.log 2>&1 
     mv dist commons-$component
     tar -czf commons-${component}-$time_stamp.tar.gz commons-$component
-    # FIXME (or vmbuild) Ubuntu does not seem to have zip??  Next line fails...
     zip -q -r commons-${component}-$time_stamp.zip commons-$component
 
     # Upload files



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to