summaryrefslogtreecommitdiff
path: root/maintainer-scripts
diff options
context:
space:
mode:
authorgerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-23 22:55:50 +0000
committergerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-23 22:55:50 +0000
commitafd2f2abf011183ecf17a8645d7221d7c36ab896 (patch)
treea3b4b6ba3293798dc8dedc864f5783e85cf66f85 /maintainer-scripts
parent7320291e722f35f27be0efec95a6f75801229b21 (diff)
downloadgcc-afd2f2abf011183ecf17a8645d7221d7c36ab896.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67143 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
-rw-r--r--maintainer-scripts/ChangeLog12
-rwxr-xr-xmaintainer-scripts/gcc_release19
2 files changed, 21 insertions, 10 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 975c615a041..b6dfc1cbed7 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 9f22b839d0d..58538ffed16 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'.