diff options
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 5 | ||||
| -rwxr-xr-x | maintainer-scripts/gcc_release | 12 | ||||
| -rwxr-xr-x | maintainer-scripts/update_version | 32 |
3 files changed, 25 insertions, 24 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 9510f8e5af9..edba50ca0b3 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,8 @@ +2002-09-23 Zack Weinberg <zack@codesourcery.com> + + * update_version: Do not check in files which are unchanged. + * gcc_release: Only update the version in gcc/version.c. + 2002-09-17 Joseph S. Myers <jsm@polyomino.org.uk> * update_web_docs (MANUALS): Add fastjar. diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 50e6803532b..45169e78f76 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -126,8 +126,7 @@ EOF error "Could not commit ${x}" done - # Update `gcc/version.c'. There are other version files - # as well, which should have release status updated. + # Update `gcc/version.c'. for x in gcc/version.c; do y=`basename ${x}` (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \ @@ -136,15 +135,6 @@ EOF ${CVS} ci -m 'Update version' ${y}) || \ error "Could not update ${x}" done - for x in gcc/ada/gnatvsn.ads gcc/f/version.c libf2c/libF77/Version.c \ - libf2c/libI77/Version.c libf2c/libU77/Version.c; do - y=`basename ${x}` - (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \ - sed -e 's/experimental\|prerelease/release/g' < ${y} > ${y}.new && \ - mv ${y}.new ${y} && \ - ${CVS} ci -m 'Update version' ${y}) || \ - error "Could not update ${x}" - done # Make sure we tag the sources for a final release. TAG="gcc_`echo ${RELEASE} | tr . _`_release" diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version index bb94944710a..ff29928be2e 100755 --- a/maintainer-scripts/update_version +++ b/maintainer-scripts/update_version @@ -45,23 +45,29 @@ for BRANCH in $BRANCHES; do for file in $textstring_FILES; do if test -f $file; then - OLD_VERSION=`/bin/cat $file` - /bin/sed -e "s/\(.*\"[^ ]*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/" >${file} <<HERE -$OLD_VERSION -HERE - - COMMIT_FILES="$COMMIT_FILES $file" + /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}/" + + if /usr/bin/cmp -s $file $file.new; then + rm -f $file.new + else + mv -f $file.new $file + COMMIT_FILES="$COMMIT_FILES $file" + fi fi done for file in $cppdefine_FILES; do - if test -f $file; then - OLD_VERSION=`/bin/cat $file` - /bin/sed -e "s/\(#.*\) [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/\1 ${CURR_DATE}/" >${file} <<HERE -$OLD_VERSION -HERE - - COMMIT_FILES="$COMMIT_FILES $file" + 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}/" + + if /usr/bin/cmp -s $file $file.new; then + rm -f $file.new + else + mv -f $file.new $file + COMMIT_FILES="$COMMIT_FILES $file" + fi fi done |