This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: Improve version tagging


This patch makes the gccadmin cronjob that updates version.c files
more automated; it can now find all the branches to update by itself.

Tested by running the script to update version numbers.

Checked out in ~gccadmin.

-- 
Mark Mitchell                mark@codesourcery.com
CodeSourcery, LLC            http://www.codesourcery.com

2002-02-25  Mark Mitchell  <mark@codesourcery.com>

	* update_version: Automatically update version files on all
	branches.
	* crontab: Only invoke update_version once.

Index: crontab
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/crontab,v
retrieving revision 1.5
diff -c -p -r1.5 crontab
*** crontab	2001/10/24 03:15:38	1.5
--- crontab	2002/02/26 07:12:32
***************
*** 1,5 ****
  16 0 * * * sh /home/gccadmin/scripts/update_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
  40 16 * * 1 sh /home/gccadmin/scripts/gcc_release -s -l -d 
/sourceware/snapshot-tmp all
--- 1,4 ----
Index: update_version
===================================================================
RCS file: /cvs/gcc/gcc/maintainer-scripts/update_version,v
retrieving revision 1.3
diff -c -p -r1.3 update_version
*** update_version	2001/06/25 19:26:25	1.3
--- update_version	2002/02/26 07:12:32
***************
*** 1,14 ****
  #!/bin/sh

  # Run this from /tmp.
! CVSROOT=/cvs/gcc
  export CVSROOT
  /bin/rm -rf /tmp/$$
  /bin/mkdir /tmp/$$
  cd /tmp/$$

  # ARGS is passed to 'cvs co'
- ARGS="$*"
  CURR_DATE=`/bin/date +"%Y%m%d"`

  # version is contained within a char*
--- 1,24 ----
  #!/bin/sh

  # Run this from /tmp.
! CVSROOT=${CVSROOT:-/cvs/gcc}
  export CVSROOT
  /bin/rm -rf /tmp/$$
  /bin/mkdir /tmp/$$
  cd /tmp/$$

+ # The path to cvs.
+ CVS=${CVS:-/usr/local/bin/cvs}
+
+ # Compute the branches which we should update.
+ $CVS co gcc/ChangeLog
+ BRANCHES=`$CVS status -v gcc/ChangeLog \
+           | awk '{print $1;}' \
+           | egrep 'gcc-[0-9]+_[0-9]+-branch$'`
+ # Always update the mainline.
+ BRANCHES="${BRANCHES} HEAD"
+
  # 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/
*** 17,41 ****
  # version is contained within a #define
  cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config"

! /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

! 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

--- 27,80 ----
  # version is contained within a #define
  cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config"

! # Assume all will go well.
! RESULT=0

! for BRANCH in $BRANCHES; do
!   # Check out the files on the branch.  HEAD is a special case; if
!   # you check out files with -r HEAD, CVS will not let you check
!   # in changes.
!   if test "$BRANCH" = HEAD; then
!     ${CVS} co $textstring_FILES $cppdefine_FILES
!   else
!     ${CVS} co -r $BRANCH $textstring_FILES $cppdefine_FILES
!   fi
!
!   # There are no files to commit yet.
!   COMMIT_FILES=""
!
!   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"
!     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"
!     fi
!   done
!
!   if test -n "$COMMIT_FILES" \
!      && ! ${CVS} commit -m "Daily bump." $COMMIT_FILES; then
!     # If we could not commit the files, indicate failure.
!     RESULT=1
!   fi

!   # Remove the files.
!   rm -rf gcc
! done

  /bin/rm -rf /tmp/$$
! exit $RESULT



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]