2001-06-25 Phil Edwards <pme@sources.redhat.com>

	* update_version:  Add command-line argument capability, also
	bump version for libstdc++-v3, and exit with the return code from
	the cvs commit.
	* crontab:  Call update_version with arguments instead of
	calling update_branch_version.
	* update_branch_version:  Remove.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43555 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 29 insertions, 33 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index c8117cf453a..9c07464a7bc 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-25  Phil Edwards  <pme@sources.redhat.com>
+
+	* update_version:  Add command-line argument capability, also
+	bump version for libstdc++-v3, and exit with the return code from
+	the cvs commit.
+	* crontab:  Call update_version with arguments instead of
+	calling update_branch_version.
+	* update_branch_version:  Remove.
+
 2001-06-08  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* update_web_docs: Only update the install documentation for the 
diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index 9690315e1f8..8b1b9ef36b8 100644
--- a/maintainer-scripts/crontab
+++ b/maintainer-scripts/crontab
@@ -1,4 +1,4 @@
 16 0 * * * sh /home/gccadmin/scripts/update_version
-16 0 * * * sh /home/gccadmin/scripts/update_branch_version
+16 0 * * * sh /home/gccadmin/scripts/update_version -rgcc-3_0-branch
 50 0 * * * sh /home/gccadmin/scripts/update_web_docs
 55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx
diff --git a/maintainer-scripts/update_branch_version b/maintainer-scripts/update_branch_version
deleted file mode 100755
index 88b05643793..00000000000
--- a/maintainer-scripts/update_branch_version
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh 
-
-# Run this from /tmp.
-CVSROOT=/cvs/gcc
-export CVSROOT
-BRANCH=gcc-3_0-branch
-export BRANCH
-/bin/rm -rf /tmp/$$
-/bin/mkdir /tmp/$$
-cd /tmp/$$
-
-CURR_DATE=`/bin/date +"%Y%m%d"`
-
-FILES="gcc/gcc/version.c gcc/gcc/f/version.c gcc/libf2c/libF77/Version.c gcc/libf2c/libI77/Version.c gcc/libf2c/libU77/Version.c"
-
-/usr/local/bin/cvs co -r$BRANCH $FILES
-
-for file in $FILES; do
-
-  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
-done
-
-/usr/local/bin/cvs commit -m "Bump dates." $FILES
-
-/bin/rm -rf /tmp/$$
diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version
index 6115664ef8f..cd3c5e6ea18 100755
--- a/maintainer-scripts/update_version
+++ b/maintainer-scripts/update_version
@@ -7,20 +7,35 @@ export CVSROOT
 /bin/mkdir /tmp/$$
 cd /tmp/$$
 
+# ARGS is passed to 'cvs co'
+ARGS="$*"
 CURR_DATE=`/bin/date +"%Y%m%d"`
 
-FILES="gcc/gcc/version.c gcc/gcc/f/version.c gcc/libf2c/libF77/Version.c gcc/libf2c/libI77/Version.c gcc/libf2c/libU77/Version.c"
+# version is contained within a char*
+textstring_FILES="gcc/gcc/version.c gcc/gcc/f/version.c gcc/libf2c/libF77/Version.c gcc/libf2c/libI77/Version.c gcc/libf2c/libU77/Version.c"
 
-/usr/local/bin/cvs co $FILES
+# version is contained within a #define
+cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config"
 
-for file in $FILES; do
+/usr/local/bin/cvs co $ARGS $textstring_FILES $cppdefine_FILES
 
+for file in $textstring_FILES; do
   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
 done
 
-/usr/local/bin/cvs commit -m "Daily bump." $FILES
+for file in $cppdefine_FILES; do
+  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
+done
+
+/usr/local/bin/cvs commit -m "Daily bump." $textstring_FILES $cppdefine_FILES
+commit_results=$?
 
 /bin/rm -rf /tmp/$$
+exit $commit_results
+