config:

	* gcc-version.m4: Delete.
fastjar:
	* Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
	(BASEVER, DEVPHASE): New variables.
	(POD2MAN): Adjust setting of --release option.
	(fastjar.1, grepjar.1, gcc-vers.texi): New rules.
	* Makefile.in: Regenerate.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	* aclocal.m4, configure: Regenerate.
gcc:
	* BASE-VER, DATESTAMP, DEV-PHASE: New files.
	* Makefile.in (gcc_version, gcc_version_trigger, ): Delete.
	(BASEVER, DEVPHASE, DATESTAMP, BASEVER_c, DEVPHASE_c, DATESTAMP_c)
	(BASEVER_s, DEVPHASE_s, DATESTAMP_s): New variables.
	(version): Define using $(BASEVER_c).
	(Makefile, config.status, build/gcov-iov.o): No longer depends on
	version.c.
	(version.o): Depend on version files; add custom generation command.
	(prefix.o): Define BASEVER on command line.
	(s-iov): Depend on version files; adjust command.
	(TEXI_CPP_FILES, TEX_IGCC_FILES, TEXI_GCCINT_FILES, TEXI_CPPINT_FILES):
	Add gcc-vers.texi.
	(gcc-vers.texi): New rule.
	(doc/%.info, doc/%.dvi): Add -I . to command line.
	(doc/gccinstall.dvi): Likewise.
	(PACKAGE): Delete.  All uses replaced with "gcc".
	* aclocal.m4: Do not include gcc-version.m4.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	Do not AC_SUBST nor AC_DEFINE PACKAGE or VERSION.
	Set is_release based on contents of DEV-PHASE.
	Set gcc_version based on contents of BASE-VER.
	Define WIN32_REGISTRY_KEY only if the user overrode the default.
	* config.in, configure: Regenerate.
	* gccbug.in: Determine version of GCC in use at runtime.
	* gcov-iov.c: Get version number and development phase from
	command line, not by including version.c.
	* intl.c: Replace all uses of PACKAGE with "gcc".
	* libada-mk.in: Delete unused "gcc_version" variable.
	* prefix.c: Default WIN32_REGISTRY_KEY to BASEVER.
	* version.c: (VERSUFFIX): New hook for redistributors; adjust
	commentary to match.
	(version_string): Put together from pieces.
	* config/alpha/x-vms: Do not use $(gcc_version).
	* config/i386/t-nwld: Likewise.
	* doc/include/gcc-common.texi: Include gcc-vers.texi for
	version-GCC and DEVELOPMENT.
gcc/ada:
	* Make-lang.in (doc/gnat_ugn_unw.info, doc/gnat_rm.info)
	(doc/gnat_ugn_unw.dvi, doc/gnat_rm.dvi): Add gcc-vers.texi
	to dependencies.
gcc/fortran:
	* Make-lang.in (GFORTRAN_TEXI): Add gcc-vers.texi.
gcc/java:
	* Make-lang.in (TEXI_JAVA_FILES): Add gcc-vers.texi.
gcc/treelang:
	* Make-lang.in (TEXI_TREELANG_FILES): Add gcc-vers.texi.
libstdc++-v3:
	* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
	subdirectory.  Generate #define of __GLIBCXX__ from contents of
	that file.
	* include/Makefile.in: Regenerate.
	* include/bits/c++config: Do not define __GLIBCXX__.
maintainer-scripts:
	* README: Update.
	* gcc_release: Update gcc/DEV-PHASE if that file exists, instead
	of gcc/version.c.
	* update_version: Handle updating gcc/DATESTAMP.
	* update_web_docs: Generate gcc-vers.texi first.


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

5 files changed, 74 insertions, 28 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 3393ecb9cb5..991f1fd9795 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-15  Zack Weinberg  <zack@codesourcery.com>
+
+	* README: Update.
+	* gcc_release: Update gcc/DEV-PHASE if that file exists, instead
+	of gcc/version.c.
+	* update_version: Handle updating gcc/DATESTAMP.
+	* update_web_docs: Generate gcc-vers.texi first.
+
 2005-03-10  Ranjit Mathew  <rmathew@hotmail.com>
 
 	* gcc_release (ADA_DIRS): Add "gnattools".
@@ -8,7 +16,7 @@
 
 2004-12-30  Sebastian Pop  <pop@cri.ensmp.fr>
 
-	* update_version (ADD_BRANCHES): Replace lno-branch with 
+	* update_version (ADD_BRANCHES): Replace lno-branch with
 	autovect-branch.
 
 2004-09-11  Gerald Pfeifer  <gerald@pfeifer.com>
@@ -24,7 +32,7 @@
 
 	* gcc_release (snapshot_print): Accept arguments.  Don't use echo -e.
 	(announce_snapshot):  Update for above.  Don't use echo -e.
-	
+
 2004-08-03 Kelley Cook  <kcook@gcc.gnu.org>
 
 	* maintainer-scripts (snapshot_print): New function.
@@ -84,11 +92,11 @@
 
 	* crontab: Move GCC 3.4 snapshots from Wednesday afternoon to
 	Friday night, where gcc.gnu.org has less load.
-	
+
 2004-05-02  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* crontab: Adjust temporary directory used for snapshot generation.
-	Move GCC 3.3 snapshots to Wednesday 22:32, where gcc.gnu.org has 
+	Move GCC 3.3 snapshots to Wednesday 22:32, where gcc.gnu.org has
 	less load.
 
 2004-04-19  Mark Mitchell  <mark@codesourcery.com>
@@ -120,7 +128,7 @@
 
 	* gcc_release (announce_snapshot): Use changedir instead of
 	plain cd.
-	
+
 2004-02-10  Arnaud Charlet  <charlet@act-europe.fr>
 
 	* gcc_release: Add libada as part of ADA_DIRS.
@@ -146,7 +154,7 @@
 2004-01-02  Gerald Pfeifer  <gp@suse.de>
 
 	* update_version: Add some documentation.
-	
+
 2004-01-02  Pop Sébastian  <pop@gauvain.u-strasbg.fr>
 
 	* update_version (ADD_BRANCHES): Add lno-branch.
@@ -169,7 +177,7 @@
 
 	* gcc_release (build_sources): Create/update the LAST_UPDATED file
 	in the source directory with information how sources were obtained.
-	
+
 2003-08-16  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* gcc_release (build_sources): Use two new variables EXPORTTAG and
@@ -194,7 +202,7 @@
 	(BRANCH): Remove default initialization for snapshots.
 	(CVSBRANCH): Ditto.
 	Do not lay down a CVS tag if generating a snapshot from mainline.
-	
+
 2003-07-19  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* gcc_release (announce_snapshot): Use ${RELEASE} instead
@@ -214,7 +222,7 @@
 	* snapshot-index.html: Ditto.
 
 2003-07-09  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
-	
+
 	* gcc_release (announce_snapshot): Add substitution of @BRANCH@
 	for README and index.html.  Remove substitution of @LONG_DATE@.
 	Put index.html into the respective snapshot directory.
@@ -234,7 +242,7 @@
 	general link to the diff/ subdirectory.
 	Mention the concrete snapshot in <title> and <h1>.
 	Adjust links to the new location of index.html.
-	
+
 2003-07-08  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* gcc_release: Move handling of complex modes directly after
@@ -266,7 +274,7 @@
 
 	* gcc_release (build_sources): Do not include gnats.html any longer.
 	Make an error message more descriptive.
-	
+
 2003-06-25  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* gcc_release: Factor the updating of links and READMEs on the
@@ -302,7 +310,7 @@
 
 2003-06-14  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
-	* snapshot-README: Use GCC instead of gcc, C++ front end instead of 
+	* snapshot-README: Use GCC instead of gcc, C++ front end instead of
 	g++ language, and note that Java includes a run time.
 	* snapshot.index.html: Ditto.
 
@@ -313,11 +321,11 @@
 
 2003-05-28  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
-	* snapshot-index.html: Refer to .bz2 files instead of .gz files. 
+	* snapshot-index.html: Refer to .bz2 files instead of .gz files.
 	Simplify the note on not using unannounced snapshots.
-	
+
 2003-05-28  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
-	
+
 	* snapshot-README: Refer to .bz2 files instead of .gz files.
 	Add a note on where to find the diff files.
 	Simplify the note on not using unannounced snapshots.
diff --git a/maintainer-scripts/README b/maintainer-scripts/README
index 1735002adbc..eeffed413d8 100644
--- a/maintainer-scripts/README
+++ b/maintainer-scripts/README
@@ -1,6 +1,6 @@
 This directory contains various files used by the gccadmin account on
 gcc.gnu.org, mainly for automated tasks such as the daily update of
-the date in version.c.  There isn't presently any scheme for files
+the date in gcc/DATESTAMP.  There isn't presently any scheme for files
 checked in here to be automatically checked out and used by gccadmin,
 so the files in CVS and those used by gccadmin must be kept in sync
 manually.
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index f75d9befa14..51422b99af6 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -140,15 +140,25 @@ EOF
       fi
     done
 
-    # Update `gcc/version.c'.
-    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} && \
-          ${CVS} ci -m 'Update version' ${y}) || \
-	  error "Could not update ${x}"
-    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 && \
+       ${CVS} 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} && \
+            ${CVS} ci -m 'Update version' ${y}) || \
+	    error "Could not update ${x}"
+      done
+    fi
 
     # 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 ba05fe58f48..47109bd7464 100755
--- a/maintainer-scripts/update_version
+++ b/maintainer-scripts/update_version
@@ -36,6 +36,11 @@ 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
 
@@ -45,9 +50,9 @@ for BRANCH in $BRANCHES; do
   # 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
+    ${CVS} co $FILES
   else
-    ${CVS} co -r $BRANCH $textstring_FILES $cppdefine_FILES
+    ${CVS} co -r $BRANCH $FILES
   fi
 
   # There are no files to commit yet.
@@ -81,6 +86,19 @@ for BRANCH in $BRANCHES; do
     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.
diff --git a/maintainer-scripts/update_web_docs b/maintainer-scripts/update_web_docs
index e22779c7bcc..d7b3da116fd 100755
--- a/maintainer-scripts/update_web_docs
+++ b/maintainer-scripts/update_web_docs
@@ -88,7 +88,7 @@ find $CVSROOT/gcc -name \*.texi,v -print | fgrep -v -f/home/gccadmin/scripts/doc
 
 
 # Checkout all the texi files.
-cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/include/texinfo.tex gcc/gcc/ada/xgnatugn.adb gcc/gcc/ada/ug_words
+cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/include/texinfo.tex gcc/gcc/ada/xgnatugn.adb gcc/gcc/ada/ug_words gcc/gcc/BASE-VER gcc/gcc/DEV-PHASE
 
 # Build a tarball of the sources.
 tar cf docs-sources.tar gcc
@@ -107,6 +107,16 @@ if [ -f gcc/gcc/ada/xgnatugn.adb ]; then
      gcc/gcc/ada/ug_words gnat_ugn_unw.texi
 fi
 
+# Generate gcc-vers.texi.
+(
+   echo "@set version-GCC $(cat gcc/gcc/BASE-VER)"
+   if "$(cat gcc/gcc/DEV-PHASE)" = "experimental"; then
+      echo "@set DEVELOPMENT"
+   else
+      echo "@clear DEVELOPMENT"
+   fi
+) > $includedir/gcc-vers.texi
+
 # Now convert the relevant files from texi to HTML and PostScript.
 for file in $MANUALS; do
   filename=`find . -name ${file}.texi`