This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Ada version strings patch
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 25 May 2002 17:03:48 +0100 (BST)
- Subject: Ada version strings patch
The Ada front end version number is, on both the mainline and branch,
3.1 with an old date in a format different from that used in the rest
of GCC (rather than 3.2 or 3.1.1 with the current date in a standard
format). This patch fixes this, making the necessary changes to
gcc_release to adjust release status in gnatvsn.ads and to
update_version to update the date in that version file (as with the
other version files) daily.
Bootstrapped (mainline and 3.1 branch) on i686-pc-linux-gnu (no Ada
testsuite, so not regression tested). OK to commit (to mainline and
3.1 branch)?
Mainline:
gcc/ada:
2002-05-25 Joseph S. Myers <jsm28@cam.ac.uk>
* gnatvsn.ads (Gnat_Version_String): Change to "3.2 20020525
(experimental)".
maintainer-scripts:
2002-05-25 Joseph S. Myers <jsm28@cam.ac.uk>
* gcc_release: Add gcc/ada/gnatvsn.ads to list of files in which
release status is updated.
* update_version (textstring_FILES): Add gcc/ada/gnatvsn.ads.
3.1 branch:
gcc/ada:
2002-05-25 Joseph S. Myers <jsm28@cam.ac.uk>
* gnatvsn.ads (Gnat_Version_String): Change to "3.1.1 20020525
(prerelease)".
maintainer-scripts:
2002-05-25 Joseph S. Myers <jsm28@cam.ac.uk>
* gcc_release: Add gcc/ada/gnatvsn.ads to list of files in which
release status is updated.
diff -ruN mainline.orig/gcc/ada/gnatvsn.ads mainline/gcc/ada/gnatvsn.ads
--- mainline.orig/gcc/ada/gnatvsn.ads 2002-03-15 10:39:51.000000000 +0000
+++ mainline/gcc/ada/gnatvsn.ads 2002-05-24 18:01:05.000000000 +0000
@@ -37,7 +37,7 @@
package Gnatvsn is
- Gnat_Version_String : constant String := "3.1 (20020212)";
+ Gnat_Version_String : constant String := "3.2 20020525 (experimental)";
-- Version output when GNAT (compiler), or its related tools, including
-- GNATBIND, GNATCHOP, GNATFIND, GNATLINK, GNATMAKE, GNATXREF, are run
-- (with appropriate verbose option switch set).
diff -ruN mainline.orig/maintainer-scripts/gcc_release mainline/maintainer-scripts/gcc_release
--- mainline.orig/maintainer-scripts/gcc_release 2002-05-21 16:34:23.000000000 +0000
+++ mainline/maintainer-scripts/gcc_release 2002-05-24 18:00:29.000000000 +0000
@@ -136,7 +136,7 @@
${CVS} ci -m 'Update version' ${y}) || \
error "Could not update ${x}"
done
- for x in gcc/f/version.c libf2c/libF77/Version.c \
+ 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}` && \
diff -ruN mainline.orig/maintainer-scripts/update_version mainline/maintainer-scripts/update_version
--- mainline.orig/maintainer-scripts/update_version 2002-03-06 21:25:36.000000000 +0000
+++ mainline/maintainer-scripts/update_version 2002-05-24 18:00:02.000000000 +0000
@@ -22,7 +22,7 @@
CURR_DATE=`/bin/date +"%Y%m%d"`
# 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"
+textstring_FILES="gcc/gcc/version.c gcc/ada/gnatvsn.ads 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 #define
cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config"
diff -ruN 3.1-branch.orig/gcc/ada/gnatvsn.ads 3.1-branch/gcc/ada/gnatvsn.ads
--- 3.1-branch.orig/gcc/ada/gnatvsn.ads 2002-05-25 13:20:27.000000000 +0000
+++ 3.1-branch/gcc/ada/gnatvsn.ads 2002-05-25 13:22:14.000000000 +0000
@@ -38,7 +38,7 @@
package Gnatvsn is
- Gnat_Version_String : constant String := "3.1 (20020501)";
+ Gnat_Version_String : constant String := "3.1.1 20020525 (prerelease)";
-- Version output when GNAT (compiler), or its related tools, including
-- GNATBIND, GNATCHOP, GNATFIND, GNATLINK, GNATMAKE, GNATXREF, are run
-- (with appropriate verbose option switch set).
diff -ruN 3.1-branch.orig/maintainer-scripts/gcc_release 3.1-branch/maintainer-scripts/gcc_release
--- 3.1-branch.orig/maintainer-scripts/gcc_release 2002-05-10 09:54:11.000000000 +0000
+++ 3.1-branch/maintainer-scripts/gcc_release 2002-05-24 18:01:29.000000000 +0000
@@ -136,7 +136,7 @@
${CVS} ci -m 'Update version' ${y}) || \
error "Could not update ${x}"
done
- for x in gcc/f/version.c libf2c/libF77/Version.c \
+ 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}` && \
--- branching.html.orig 2002-05-03 19:35:22.000000000 +0000
+++ branching.html 2002-05-24 17:56:35.000000000 +0000
@@ -20,10 +20,12 @@
<li>Update <code>cvs.html</code> web page to list the new branch tags.</li>
-<li>Update all <code>[vV]ersion.c</code> files on the branch, to say
+<li>Update all <code>[vV]ersion.c</code> files and
+<code>gcc/ada/gnatvsn.ads</code> on the branch, to say
"prerelease" instead of "experimental".</li>
-<li>Update all <code>[vV]ersion.c</code> files on the mainline, to use
+<li>Update all <code>[vV]ersion.c</code> files and
+<code>gcc/ada/gnatvsn.ads</code> on the mainline, to use
the next major release number (e.g., 3.2 instead of 3.1).</li>
<li>Update <code>doc/include/gcc-common.texi</code> on the mainline to
--- releasing.html.orig 2002-02-23 23:14:26.000000000 +0000
+++ releasing.html 2002-05-24 17:57:22.000000000 +0000
@@ -62,8 +62,9 @@
FSF.</li>
</ul></li>
-<li>Increment the version numbers in the <code>[vV]version.c</code>
-files and make them include the date and <code>(prerelease)</code>
+<li>Increment the version numbers in the <code>[vV]ersion.c</code>
+files and <code>gcc/ada/gnatvsn.ads</code>
+and make them include the date and <code>(prerelease)</code>
instead of saying <code>(release)</code> and the old release version,
before allowing any new checkins to the branch.</li>
</ol>
--
Joseph S. Myers
jsm28@cam.ac.uk