diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-13 02:18:51 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-13 02:18:51 +0000 |
| commit | dc496b3088e7afe723b5eac5ca876aaa7aef9e92 (patch) | |
| tree | 84db540e9506cd306c69b1fbc1b56e67fcd9d6e6 /maintainer-scripts | |
| parent | 7129a9507606aec4a82c4f7c035b4dc061724414 (diff) | |
Mainline merge as of 2003-05-11
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@66748 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 11 | ||||
| -rwxr-xr-x | maintainer-scripts/update_version | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 991095c8027..8207c42166f 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,14 @@ +2003-05-09 Gerald Pfeifer <gerald@sourceware.org> + + * update_version (ADD_BRANCHES): Add, set to MAIN and + tree-ssa-20020619-branch. + (BRANCHES): Always consider branches given by $ADD_BRANCHES. + +2003-05-04 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * update_version (textstring_FILES): Only version.c needs to be + updated, now that we do not consider older branches any more. + 2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at> * update_version (IGNORE_BRANCHES): Add. diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version index bde683eb8ec..b8e8a1e7a5e 100755 --- a/maintainer-scripts/update_version +++ b/maintainer-scripts/update_version @@ -2,6 +2,7 @@ CVSROOT=${CVSROOT:-/cvs/gcc} IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2)-branch' +ADD_BRANCHES='HEAD tree-ssa-20020619-branch' # Run this from /tmp. export CVSROOT @@ -19,13 +20,13 @@ BRANCHES=`$CVS status -v gcc/ChangeLog \ | egrep 'gcc-[0-9]+_[0-9]+-branch$' \ | egrep -v $IGNORE_BRANCHES` # Always update the mainline. -BRANCHES="${BRANCHES} HEAD" +BRANCHES="${BRANCHES} ${ADD_BRANCHES}" # ARGS is passed to 'cvs co' CURR_DATE=`/bin/date +"%Y%m%d"` # version is contained within a char* -textstring_FILES="gcc/gcc/version.c gcc/gcc/ada/gnatvsn.ads gcc/gcc/f/version.c gcc/libf2c/libF77/Version.c gcc/libf2c/libI77/Version.c gcc/libf2c/libU77/Version.c" +textstring_FILES="gcc/gcc/version.c" # version is contained within a #define cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config" |