On Mon, Nov 14, 2005 at 02:05:47PM -0800, H. J. Lu wrote:
> On Mon, Nov 14, 2005 at 12:52:49PM -0800, Mike Stump wrote:
> > On Nov 14, 2005, at 9:14 AM, H. J. Lu wrote:
> > >Can we change it to something like
> > >
> > >gcc (GCC) 4.1.0 20051113 (revision 106863) (experimental)
> >
> > Doesn't work, unless you also have the branch name. Further, the
> > substitutions that svn can do, doesn't allow for the above, and they
> > don't want to `fix' svn to do it (see the FAQ). (I think I'd like it
> > too.)
>
I am enclosing 2 patches:
1. contrib/gcc_update creates gcc/REVISION with branch name and
revision number.
2. If gcc/REVISION exists, it will be used in gcc/version.c.
With those 2 patches, I got
[EMAIL PROTECTED] gcc]$ ./xgcc --version
xgcc (GCC) 4.1.0 (gcc-4_1-branch revision 108596) 20051215 (prerelease)
Copyright (C) 2005 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is
NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
and
[EMAIL PROTECTED] gcc]$ ./xgcc --version
xgcc (GCC) 4.2.0 (trunk revision 108596) 20051215 (experimental)
Copyright (C) 2005 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is
NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
H.J.
2005-12-15 H.J. Lu <[EMAIL PROTECTED]>
* gcc_update: Create gcc/REVISION with branch name and revision
number.
Index: contrib/gcc_update
===================================================================
--- contrib/gcc_update (revision 108596)
+++ contrib/gcc_update (working copy)
@@ -250,8 +250,18 @@
exit 1
fi
+rm -f info.$$
+
+svn info > info.$$
+revision=`grep Revision: info.$$ | awk '{ print $2 }'`
+branch=`grep URL: info.$$ | sed -e "s,.*/,,g"`
{
date
- echo "`TZ=UTC date` (revision `svnversion .`)"
+ echo "`TZ=UTC date` (revision $revision)"
} > LAST_UPDATED
+
+rm -f info.$$
+
+echo "($branch revision $revision)" > gcc/REVISION
+
touch_files_reexec
2005-12-15 H.J. Lu <[EMAIL PROTECTED]>
* Makefile.in (REVISION): New.
(REVISION_c): New.
(REVISION_s): New.
(version.o): Also depend on $(REVISION). Add
-DREVISION=$(REVISION_s).
* version.c (version_string): Add REVISION.
--- gcc/Makefile.in.rev 2005-12-13 12:08:07.000000000 -0800
+++ gcc/Makefile.in 2005-12-15 13:45:05.000000000 -0800
@@ -708,11 +708,18 @@ TM_H = $(GTM_H) insn-constants.h in
BASEVER := $(srcdir)/BASE-VER # 4.x.y
DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
+REVISION := $(srcdir)/REVISION # (BRANCH revision XXXXXX)
BASEVER_c := $(shell cat $(BASEVER))
DEVPHASE_c := $(shell cat $(DEVPHASE))
DATESTAMP_c := $(shell cat $(DATESTAMP))
+ifeq (,$(wildcard $(REVISION)))
+REVISION :=
+else
+REVISION_c := $(shell cat $(REVISION))
+endif
+
version := $(BASEVER_c)
# For use in version.c - double quoted strings, with appropriate
@@ -724,6 +731,12 @@ BASEVER_s := "\"$(BASEVER_c)\""
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
+ifdef REVISION_c
+REVISION_s := "\"$(if $(DEVPHASE_c), $(REVISION_c))\""
+else
+REVISION_s :=
+endif
+
# Shorthand variables for dependency lists.
TARGET_H = $(TM_H) target.h insn-modes.h
MACHMODE_H = machmode.h mode-classes.def insn-modes.h
@@ -1724,9 +1737,10 @@ options.o: options.c $(CONFIG_H) $(SYSTE
dumpvers: dumpvers.c
-version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
+version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
+ -DREVISION=$(REVISION_s) \
-DDEVPHASE=$(DEVPHASE_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
--- gcc/version.c.rev 2005-11-04 14:14:18.000000000 -0800
+++ gcc/version.c 2005-12-15 13:28:03.000000000 -0800
@@ -20,6 +20,7 @@
const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
/* The complete version string, assembled from several pieces.
- BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */
+ BASEVER, REVISION, DATESTAMP, and DEVPHASE are defined by the
+ Makefile. */
-const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX;
+const char version_string[] = BASEVER REVISION DATESTAMP DEVPHASE VERSUFFIX;
