Changeset 2073 for stable


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/commit_new_release

    r1957 r2073  
    4545
    4646# Process the parameters. A parameter without an opening `-' is assumed to be
    47 # the spec for the directory to be committed.
     47# the spec for the directory to be committed. (Strip any trailing '/'. Some
     48# people add it, but the script doesn't expect it.)
    4849
    4950  while test $# -gt 0 && test $printHelp = 0 ; do
     
    5859           printHelp=1
    5960           ;;
    60         *) dirToCommit="$1"
     61        *) dirToCommit=`echo $1 | sed -e 's,/$,,'`
    6162           ;;
    6263    esac
  • stable/0.6/commit_new_stable

    r1957 r2073  
    4343
    4444# Process the parameters. A parameter without an opening `-' is assumed to be
    45 # the spec for the directory to be committed.
     45# the spec for the directory to be committed. (Strip any trailing '/'. Some
     46# people add it, but the script doesn't expect it.)
    4647
    4748  while test $# -gt 0 && test $printHelp = 0 ; do
     
    5657           printHelp=1
    5758           ;;
    58         *) dirToCommit="$1"
     59        *) dirToCommit=`echo $1 | sed -e 's,/$,,'`
    5960           ;;
    6061    esac
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.6/prepare_new_release

    r1957 r2073  
    564564        extBTURL=`svn propget svn:externals $ext_rel_url_notail`
    565565        extBTURL=`echo $extBTURL | \
    566           sed -n -e 's/.*BuildTools https:\([^ ]*\) .*/https:\1/p'`
     566          sed -n -e 's/^BuildTools *https:\([^ ]*\) *$/https:\1/p'`
    567567        if test -n "$extBTURL" ; then
    568568          testResult=`compareURLVersions "$ourBTURL" "$extBTURL"`
  • stable/0.6/prepare_new_stable

    r1957 r2073  
    514514        extBTURL=`svn propget svn:externals $ext_url_notail`
    515515        extBTURL=`echo $extBTURL | \
    516           sed -n -e 's/.*BuildTools https:\([^ ]*\) .*/https:\1/p'`
     516          sed -n -e 's/^BuildTools *https:\([^ ]*\) *$/https:\1/p'`
    517517        if test -n "$extBTURL" ; then
    518518          testResult=`compareURLVersions "$srcBTURL" "$extBTURL"`
Note: See TracChangeset for help on using the changeset viewer.