X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=maintainer-scripts%2Fupdate_version_svn;h=69891558f5084cffe378f21f4d3f8cd3c11e5b56;hp=00edc6507149cc4069bbe1fc21c8ea36a2b57e02;hb=2136cd14292eca6dbc25f8f6013d4a2d5568cc1d;hpb=c9cef0254a893cfc9f104b3446febfbb5e9ba337;ds=sidebyside diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn index 00edc650714..69891558f50 100755 --- a/maintainer-scripts/update_version_svn +++ b/maintainer-scripts/update_version_svn @@ -6,8 +6,8 @@ # in $ADD_BRANCHES. SVNROOT=${SVNROOT:-"file:///svn/gcc"} -IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3)-branch' -ADD_BRANCHES='HEAD autovect-branch dfp-branch' +IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4)-branch' +ADD_BRANCHES='HEAD autovect-branch' # Run this from /tmp. export SVNROOT @@ -23,10 +23,9 @@ BRANCHES=`$SVN ls $SVNROOT/branches \ | sed -e 's/\///' \ | egrep 'gcc-[0-9]+_[0-9]+-branch$' \ | egrep -v $IGNORE_BRANCHES` - # Always update the mainline. BRANCHES="${BRANCHES} ${ADD_BRANCHES}" -BRANCHES="HEAD" + # ARGS is passed to 'cvs co' CURR_DATE=`/bin/date +"%Y%m%d"` @@ -51,11 +50,11 @@ for BRANCH in $BRANCHES; do # in changes. if test "$BRANCH" = HEAD; then for i in $FILES; do - ${SVN} co -N ${SVNROOT}/trunk/`dirname $i` `basename $i` + ${SVN} -q co -N ${SVNROOT}/trunk/`dirname $i` `basename $i` done else for i in $FILES; do - ${SVN} co -N ${SVNROOT}/branches/${BRANCH}/`dirname $i` `basename $i` + ${SVN} -q co -N ${SVNROOT}/branches/${BRANCH}/`dirname $i` `basename $i` done fi @@ -66,8 +65,6 @@ for BRANCH in $BRANCHES; do dirname=`basename $file` file=`basename $file` file="$dirname/$file" - echo "$file" - exit 0; if test -f $file; then /bin/sed <$file >$file.new -e \ "s/\(.*\"[^ ]*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/" @@ -80,6 +77,7 @@ for BRANCH in $BRANCHES; do fi fi done + for file in $cppdefine_FILES; do dirname=`basename $file` file=`basename $file` @@ -112,7 +110,7 @@ for BRANCH in $BRANCHES; do fi fi done - echo "$COMMIT_FILES" + if test -n "$COMMIT_FILES"; then for i in $COMMIT_FILES; do echo "Attempting to commit $i"