X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustrecvs;h=fa24a0135ee0e7a669af648ed03e52528c108712;hp=5c9f0ab61f2158571467d10a912c9444075c40c2;hb=51c037f2d7d7c7b713ab21617eb983f231510a33;hpb=84b2b6965fb887e0abbd91e11d67e123ce69fb16

diff --git a/lustrecvs b/lustrecvs
index 5c9f0ab..fa24a01 100755
--- a/lustrecvs
+++ b/lustrecvs
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
+LC_COLLATE="C"
 progname="${0##*/}"
 
 warn ()
@@ -18,16 +19,31 @@ fatal ()
 usage ()
 {
     cat <<EOF
-Usage: $progname lustretag
-  where lustretag is a tag of the lustre-core module
+Usage: $progname <lustretag> <pindate>
+  where <lustretag> is a tag of the lustre-core module
+  and <pindate> is an optional quoted timestamp suitable for cvs -D
 EOF
 }
 
-# portalstag="HEAD"
+if [ -z "$LUSTRECVS_UPDATED" ] ; then
+    echo "$progname: updating lustrecvs"
+    cvs up -l || fatal 1 "Error updating lustrecvs"
+    export LUSTRECVS_UPDATED=yes
+    exec "$0" "$@"
+fi
+
+[ "$1" = "-r" ] && shift
+
 buildtag="HEAD"
-portalstag="HEAD"
 lustretag="$1"
-libsysiotag="head_0607"
+shift
+pindate=$1
+shift
+
+if [ "$*" ] ; then
+    usage >&2
+    exit 1
+fi
 
 case "$lustretag" in
     '')
@@ -43,41 +59,81 @@ case "$lustretag" in
     # this is the branch table
     # keep this list sorted alphabetically!
 
-    b1_4_bgl)
-	portalstag="b1_4_bgl"
-	;;
+    # These use special build directories 
 
-    b_newsysio | b_sec)
-        libsysiotag="head_0809"
-	;;
+    b1_4*) buildtag="b1_4" ;;
 
-    b_port_step)
-        portalstag="b_port_step"
-	;;
+    b_release_1_4_6-patchless) buildtag="b1_4" ;;
+    b_release_1_4_7-test) buildtag="b_release_1_4_7" ;;
+
+    b_release*) buildtag=$lustretag ;;
+
+    b_uoss) buildtag=$lustretag ;;
+
+    # These releases did not get build tagged for them because they
+    # this build system didn't exist when they were tagged
+    v1_2_8|v1_4_0) 
+        buildtag="b1_4"
+        ;;
+    
+    v*) buildtag=$lustretag ;;
+
+    # this is the branch table
+    # keep this list sorted alphabetically!
 
+    *)
+        buildtag="HEAD"
+	;;
 esac
 
+error_modules=
 cvs_cmd ()
 {
-    local dir="$1"
-    local module="$2"
-    local tag="$3"
-    local cvstag=""
+    dir="$1"
+    module="$2"
+    tag="$3"
+    cotag=""
+    update=""
+
+    if [ "$tag" = "HEAD" ] ; then
+        cotag=""
+        uptag="-A"
+    elif [ "$tag" ] ; then
+        cotag="-r $tag"
+        uptag="-r $tag"
+    else
+        # silently skip if no tag was specified
+        return
+    fi
 
-    if [ "$tag" != "HEAD" ] ; then
-	cvstag="-r $tag"
+    # create a cvs date format that will survive shell expansion
+    if [ -n "$pindate" ]; then
+        datecmd=$(date -u +%s -d "$pindate")
+        datecmd="-D @$datecmd"
+    else
+        datecmd=""
     fi
 
     if [ -d "$dir" ] ; then
-	echo "$progname: Updating $dir to $tag"
-	( cd "$dir" && cvs up $cvstag )
+        echo "$progname: Updating $dir to $tag"
+        ( cd "$dir" && cvs up $datecmd -dAP $uptag )
     else
-	echo "$progname: Checking out $dir from $tag"
-	cvs co $cvstag -d "$dir" "$module"
+        echo "$progname: Checking out $dir from $tag"
+        cvs co $datecmd -P $cotag -d "$dir" "$module"
+    fi
+    if [ $? != 0 ] ; then
+        error_modules="$dir $error_modules"
     fi
 }
 
 cvs_cmd build lustre-build "$buildtag"
-cvs_cmd libsysio libsysio "$libsysiotag"
-cvs_cmd portals portals "$portalstag"
-cvs_cmd lustre lustre-core "$lustretag"
+
+if [ -f build/buildcvs ] ; then
+    . build/buildcvs
+else
+    fatal 1 "build/buildcvs does not exist; not updating other modules."
+fi
+
+if [ "$error_modules" ] ; then
+    fatal 1 "There were errors checking out the following directories: $error_modules"
+fi