Changeset 2073 for stable

Timestamp:

Jan 6, 2011 5:13:05 AM (10 years ago)

Author:

stefan

Message:

merge chgsets 2069,2071,2072 from trunk: fixes to prepare/commit_new_stable/release scripts

Location:

stable/0.6

Files:

• . (modified) (1 prop)
• commit_new_release (modified) (2 diffs)
• commit_new_stable (modified) (2 diffs)
• compile_f2c (modified) (1 prop)
• prepare_new_release (modified) (1 diff)
• prepare_new_stable (modified) (1 diff)

stable/0.6/commit_new_release

@@ -45 +45 @@
 
 # Process the parameters. A parameter without an opening `-' is assumed to be
-# the spec for the directory to be committed.
+# the spec for the directory to be committed. (Strip any trailing '/'. Some
+# people add it, but the script doesn't expect it.)
 
   while test $# -gt 0 && test $printHelp = 0 ; do
@@ -58 +59 @@
            printHelp=1
            ;;
-        *) dirToCommit="$1"
+        *) dirToCommit=`echo $1 | sed -e 's,/$,,'`
            ;;
     esac

stable/0.6/commit_new_stable

@@ -43 +43 @@
 
 # Process the parameters. A parameter without an opening `-' is assumed to be
-# the spec for the directory to be committed.
+# the spec for the directory to be committed. (Strip any trailing '/'. Some
+# people add it, but the script doesn't expect it.)
 
   while test $# -gt 0 && test $printHelp = 0 ; do
@@ -56 +57 @@
            printHelp=1
            ;;
-        *) dirToCommit="$1"
+        *) dirToCommit=`echo $1 | sed -e 's,/$,,'`
            ;;
     esac

stable/0.6/prepare_new_release

@@ -564 +564 @@
         extBTURL=`svn propget svn:externals $ext_rel_url_notail`
         extBTURL=`echo $extBTURL | \
-          sed -n -e 's/.*BuildTools https:\([^ ]*\) .*/https:\1/p'`
+          sed -n -e 's/^BuildTools *https:\([^ ]*\) *$/https:\1/p'`
         if test -n "$extBTURL" ; then
           testResult=`compareURLVersions "$ourBTURL" "$extBTURL"`

stable/0.6/prepare_new_stable

@@ -514 +514 @@
         extBTURL=`svn propget svn:externals $ext_url_notail`
         extBTURL=`echo $extBTURL | \
-          sed -n -e 's/.*BuildTools https:\([^ ]*\) .*/https:\1/p'`
+          sed -n -e 's/^BuildTools *https:\([^ ]*\) *$/https:\1/p'`
         if test -n "$extBTURL" ; then
           testResult=`compareURLVersions "$srcBTURL" "$extBTURL"`