crontab: Remove 4.1 snapshots job.

	* crontab: Remove 4.1 snapshots job.
	* update_version: Remove.
	* gcc_release: Remove support for g77 and release status in
	version.c.
	* update_version_svn: Ignore 4.1 branch.  Remove support for
	updating files other than DATESTAMP.
	* update_web_docs_svn: Remove support for g77 manual.

From-SVN: r137462

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index aaa34965ac9c75185c7e278de9d9ee20da634134..f246a012cf5c8a0bc5a203b792d656fc0d79646c 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-04  Joseph Myers  <joseph@codesourcery.com>
+
+       * crontab: Remove 4.1 snapshots job.
+       * update_version: Remove.
+       * gcc_release: Remove support for g77 and release status in
+       version.c.
+       * update_version_svn: Ignore 4.1 branch.  Remove support for
+       updating files other than DATESTAMP.
+       * update_web_docs_svn: Remove support for g77 manual.
+
 2008-02-18  Jakub Jelinek  <jakub@redhat.com>
 
        * crontab: Add 4.3 branch.  Set trunk to 4.4.

diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index 6ccf62db2ae9349c9e60a6a8684889f12d85e5c6..091c24d824980e45758320a4a632915dbc12552a 100644 (file)
--- a/maintainer-scripts/crontab
+++ b/maintainer-scripts/crontab
@@ -1,7 +1,6 @@
 16  0 * * * sh /home/gccadmin/scripts/update_version_svn
 50  0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
 55  0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
-32 22 * * 1 sh /home/gccadmin/scripts/gcc_release -s 4.1:branches/gcc-4_1-branch -l -d /sourceware/snapshot-tmp/gcc all
 32 22 * * 3 sh /home/gccadmin/scripts/gcc_release -s 4.2:branches/gcc-4_2-branch -l -d /sourceware/snapshot-tmp/gcc all
 32 22 * * 4 sh /home/gccadmin/scripts/gcc_release -s 4.3:branches/gcc-4_3-branch -l -d /sourceware/snapshot-tmp/gcc all
 32 22 * * 5 sh /home/gccadmin/scripts/gcc_release -s 4.4:trunk           -l -d /sourceware/snapshot-tmp/gcc all

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index bacb25b0ceb2a008f7addeedc9ce7808b6785acc..467ec4e4aca7b3c27f84c809a98671bd88b0ef65 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -139,25 +139,14 @@ EOF
       fi
     done
 
-    # Update gcc/DEV-PHASE if it exists, otherwise gcc/version.c.
-
-    if [ -f ${SOURCE_DIRECTORY}/gcc/DEV-PHASE ]; then
-      [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
-      error "Release number ${RELEASE} does not match BASE-VER"
-      (changedir ${SOURCE_DIRECTORY}/gcc && \
-       : > DEV-PHASE && \
-       ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
-      error "Could not update DEV-PHASE"
-    else
-      for x in gcc/version.c; do 
-        y=`basename ${x}`
-        (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
-            sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
-           mv ${y}.new ${y} && \
-            ${SVN} -q ci -m 'Update version' ${y}) || \
-           error "Could not update ${x}"
-      done
-    fi
+    # Update gcc/DEV-PHASE.
+
+    [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
+    error "Release number ${RELEASE} does not match BASE-VER"
+    (changedir ${SOURCE_DIRECTORY}/gcc && \
+     : > DEV-PHASE && \
+     ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
+    error "Could not update DEV-PHASE"
 
     # Make sure we tag the sources for a final release.
     TAG="tags/gcc_`echo ${RELEASE} | tr . _`_release"
@@ -297,7 +286,6 @@ build_tarfiles() {
   # Now, build one for each of the languages.
   maybe_build_tarfile gcc-ada-${RELEASE} ${ADA_DIRS}
   maybe_build_tarfile gcc-g++-${RELEASE} ${CPLUSPLUS_DIRS}
-  maybe_build_tarfile gcc-g77-${RELEASE} ${FORTRAN_DIRS}
   maybe_build_tarfile gcc-fortran-${RELEASE} ${FORTRAN95_DIRS}
   maybe_build_tarfile gcc-java-${RELEASE} ${JAVA_DIRS}
   maybe_build_tarfile gcc-objc-${RELEASE} ${OBJECTIVEC_DIRS}
@@ -305,7 +293,7 @@ build_tarfiles() {
    
   # The core is everything else.
   EXCLUDES=""
-  for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN_DIRS} ${FORTRAN95_DIRS}\
+  for x in ${ADA_DIRS} ${CPLUSPLUS_DIRS} ${FORTRAN95_DIRS}\
           ${JAVA_DIRS} ${OBJECTIVEC_DIRS} ${TESTSUITE_DIRS}; do
     EXCLUDES="${EXCLUDES} --exclude $x"
   done
@@ -328,7 +316,7 @@ build_diffs() {
   old_vers=${old_file%.tar.bz2}
   old_vers=${old_vers#gcc-}
   inform "Building diffs against version $old_vers"
-  for f in gcc gcc-ada gcc-g++ gcc-g77 gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
+  for f in gcc gcc-ada gcc-g++ gcc-fortran gcc-java gcc-objc gcc-testsuite gcc-core; do
     old_tar=${old_dir}/${f}-${old_vers}.tar.bz2
     new_tar=${WORKING_DIRECTORY}/${f}-${RELEASE}.tar.bz2
     if [ ! -e $old_tar ]; then
@@ -453,7 +441,6 @@ with the following options: <code>"svn://gcc.gnu.org/svn/gcc/${SVNBRANCH} revisi
   snapshot_print gcc-ada-${RELEASE}.tar.bz2 "Ada front end and runtime"
   snapshot_print gcc-fortran-${RELEASE}.tar.bz2 "Fortran front end and runtime"
   snapshot_print gcc-g++-${RELEASE}.tar.bz2 "C++ front end and runtime"
-  snapshot_print gcc-g77-${RELEASE}.tar.bz2 "Fortran 77 front end and runtime"
   snapshot_print gcc-java-${RELEASE}.tar.bz2 "Java front end and runtime"
   snapshot_print gcc-objc-${RELEASE}.tar.bz2 "Objective-C front end and runtime"
   snapshot_print gcc-testsuite-${RELEASE}.tar.bz2 "The GCC testsuite"
@@ -560,7 +547,6 @@ SOURCE_DIRECTORY=""
 # tar files.  These are all relative to the top of the source tree.
 ADA_DIRS="gcc/ada libada gnattools"
 CPLUSPLUS_DIRS="gcc/cp libstdc++-v3"
-FORTRAN_DIRS="gcc/f libf2c"
 FORTRAN95_DIRS="gcc/fortran libgfortran"
 JAVA_DIRS="gcc/java libjava libffi fastjar zlib boehm-gc"
 OBJECTIVEC_DIRS="gcc/objc gcc/objcp libobjc"
@@ -707,7 +693,6 @@ SOURCE_DIRECTORY="${WORKING_DIRECTORY}/gcc-${RELEASE}"
 # relative to the WORKING_DIRECTORY.
 ADA_DIRS=`adjust_dirs ${ADA_DIRS}`
 CPLUSPLUS_DIRS=`adjust_dirs ${CPLUSPLUS_DIRS}`
-FORTRAN_DIRS=`adjust_dirs ${FORTRAN_DIRS}`
 FORTRAN95_DIRS=`adjust_dirs ${FORTRAN95_DIRS}`
 JAVA_DIRS=`adjust_dirs ${JAVA_DIRS}`
 OBJECTIVEC_DIRS=`adjust_dirs ${OBJECTIVEC_DIRS}`

diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version
deleted file mode 100755 (executable)
index 2217052..0000000
--- a/maintainer-scripts/update_version
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-#
-# Update the current version date in all files in the tree containing
-# it.  Consider all release branches except those matching the regular
-# expression in $IGNORE_BRANCHES, and also consider those branches listed
-# in $ADD_BRANCHES.
-
-CVSROOT=${CVSROOT:-/cvs/gcc}
-IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3)-branch'
-ADD_BRANCHES='HEAD autovect-branch dfp-branch'
-
-# Run this from /tmp.
-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$' \
-          | egrep -v $IGNORE_BRANCHES`
-# Always update the mainline.
-BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
-
-# 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"
-
-# version is contained within a #define
-cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config"
-
-# version is all there is
-datestamp_FILES="gcc/gcc/DATESTAMP"
-
-FILES="$textstring_FILES $cppdefine_FILES $datestamp_FILES"
-
-# Assume all will go well.
-RESULT=0
-
-for BRANCH in $BRANCHES; do
-  echo "Working on \"$BRANCH\"."
-  # 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 $FILES
-  else
-    ${CVS} co -r $BRANCH $FILES
-  fi
-
-  # There are no files to commit yet.
-  COMMIT_FILES=""
-
-  for file in $textstring_FILES; do
-    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
-
-  for file in $cppdefine_FILES; do
-    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
-
-  for file in $datestamp_FILES; do
-    if test -f $file; then
-      echo ${CURR_DATE} > $file.new
-
-      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
-
-  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

diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index ba47687cd4f2d9a186f875361b46847c5c084364..1c87f1c50e952252f6febbe4a6ce697067841748 100755 (executable)
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -6,7 +6,7 @@
 # in $ADD_BRANCHES.
 
 SVNROOT=${SVNROOT:-"file:///svn/gcc"}
-IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0)-branch'
+IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1)-branch'
 ADD_BRANCHES='HEAD autovect-branch'
 
 # Run this from /tmp.
@@ -29,17 +29,10 @@ BRANCHES="${BRANCHES} ${ADD_BRANCHES}"
 # ARGS is passed to 'cvs co'
 CURR_DATE=`/bin/date +"%Y%m%d"`
 
-# version is contained within a char*
-textstring_FILES="gcc/version.c"
-
-# version is contained within a #define
-cppdefine_FILES="libstdc++-v3/include/bits/c++config"
-
 # version is all there is
 datestamp_FILES="gcc/DATESTAMP"
 
-FILES="$textstring_FILES $cppdefine_FILES $datestamp_FILES"
-DIRS="$textstring_DIRS $cppdefine_DIRS $datestamp_DIRS"
+FILES="$datestamp_FILES"
 
 # Assume all will go well.
 RESULT=0
@@ -60,40 +53,6 @@ for BRANCH in $BRANCHES; do
 
   # There are no files to commit yet.
   COMMIT_FILES=""
-   
-  for file in $textstring_FILES; do
-    dirname=`basename $file`
-    file=`basename $file`
-    file="$dirname/$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
-  
-  for file in $cppdefine_FILES; do
-    dirname=`basename $file`
-    file=`basename $file`
-    file="$dirname/$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
 
   for file in $datestamp_FILES; do
     dirname=`basename $file`

diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn
index 0fa9992b3994b260de2683d62def5f51f7e31e8a..74098b4ac4d0bc6982ad0b5c4a04ea55f4ebb764 100755 (executable)
--- a/maintainer-scripts/update_web_docs_svn
+++ b/maintainer-scripts/update_web_docs_svn
@@ -17,7 +17,6 @@ MANUALS="cpp
   gcc
   gccint
   gcj
-  g77
   gfortran
   gfc-internals
   gnat_ug_unx