diff options
| author | Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> | 2003-05-24 00:55:50 +0200 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2003-05-23 22:55:50 +0000 |
| commit | 4494cddec9df0ae372cfda88d48b1d887b3f1e43 (patch) | |
| tree | a3b4b6ba3293798dc8dedc864f5783e85cf66f85 | |
| parent | 5299653dc14a44b2011c073e720f7a8932c5062d (diff) | |
| download | gcc-4494cddec9df0ae372cfda88d48b1d887b3f1e43.zip gcc-4494cddec9df0ae372cfda88d48b1d887b3f1e43.tar.gz gcc-4494cddec9df0ae372cfda88d48b1d887b3f1e43.tar.bz2 | |
gcc_release (build_sources): Only update ChangeLog files which do not yet contain the entry we are going to add.
* gcc_release (build_sources): Only update ChangeLog files which
do not yet contain the entry we are going to add.
Fix typo in added ChangeLog entries.
From-SVN: r67143
| -rw-r--r-- | maintainer-scripts/ChangeLog | 12 | ||||
| -rwxr-xr-x | maintainer-scripts/gcc_release | 19 |
2 files changed, 21 insertions, 10 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 975c615..b6dfc1c 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-05-24 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * gcc_release (build_sources): Only update ChangeLog files which + do not yet contain the entry we are going to add. + Fix typo in added ChangeLog entries. + 2003-05-20 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * gcc_release (upload_files): Put diff files into a "diffs" @@ -12,7 +18,7 @@ * gcc_release (usage): Print more detailed description of all command-line options. -2003-05-09 Gerald Pfeifer <gerald@sourceware.org> +2003-05-09 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * update_version (ADD_BRANCHES): Add, set to MAIN and tree-ssa-20020619-branch. @@ -23,12 +29,12 @@ * 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> +2003-05-02 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * update_version (IGNORE_BRANCHES): Add. (BRANCHES): Do not consider branches matching $IGNORE_BRANCHES. -2003-05-02 Gerald Pfeifer <gerald@pfeifer@dbai.tuwien.ac.at> +2003-05-02 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * update_version: Add a trace of which branch we are currently working on. diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 9f22b83..58538ff 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -122,17 +122,22 @@ build_sources() { -r ${BRANCH} gcc || \ error "Could not check out release sources" for x in `find ${SOURCE_DIRECTORY} -name ChangeLog`; do - cat - ${x} > ${x}.new <<EOF + # Update this ChangeLog file only if it does not yet contain the + # entry we are going to add. (This is a safety net for repeated + # runs of this script for the same release.) + if ! grep "GCC ${RELEASE} released." ${x} > /dev/null ; then + cat - ${x} > ${x}.new <<EOF ${LONG_DATE} Release Manager - * GCC ${RELEASE} Released. + * GCC ${RELEASE} released. EOF - mv ${x}.new ${x} || \ - error "Could not update ${x}" - (changedir `dirname ${x}` && \ - ${CVS} ci -m 'Mark ChangeLog' `basename ${x}`) || \ - error "Could not commit ${x}" + mv ${x}.new ${x} || \ + error "Could not update ${x}" + (changedir `dirname ${x}` && \ + ${CVS} ci -m 'Mark ChangeLog' `basename ${x}`) || \ + error "Could not commit ${x}" + fi done # Update `gcc/version.c'. |