This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: Report branch/revsion info from "gcc -v"
On Mon, Jul 30, 2007 at 07:08:40PM +0200, Andreas Schwab wrote:
> "H.J. Lu" <hjl@lucon.org> writes:
>
> > --- gcc/Makefile.in.rev 2006-01-23 10:00:31.000000000 -0800
> > +++ gcc/Makefile.in 2006-01-23 10:29:38.000000000 -0800
> > @@ -710,11 +710,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 :=
>
> s/REVISION/REVISION_c/ ?
Thanks. I am enclosing updated patch.
>
> > Index: contrib/gcc_update
> > ===================================================================
> > --- contrib/gcc_update (revision 116299)
> > +++ contrib/gcc_update (working copy)
> > @@ -255,8 +255,18 @@ if [ $? -ne 0 ]; then
> > exit 1
> > fi
> >
> > +rm -f info.$$ LAST_UPDATED gcc/REVISION
> > +
> > +svn info > info.$$
> > +revision=`grep Revision: info.$$ | awk '{ print $2 }'`
> > +branch=`grep URL: info.$$ | sed -e "s,.*/gcc/,,g" | sed -e "s,branches/,,"`
>
> revision=`svn info | awk '/Revision:/ { print $2 }'`
> branch=`svn info | sed -ne "/URL:/ { s,.*/gcc/,,g; s,branches/,,; p; }"`
>
> (Net savings of 2 processes :-) )
>
Will "svn info" be fast for all cases? I was trying to avoid calling
"svn info" twice if it might be slow for some users.
H.J.
----
2006-01-23 H.J. Lu <hongjiu.lu@intel.com>
* 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 2006-01-23 10:00:31.000000000 -0800
+++ gcc/Makefile.in 2006-01-23 10:29:38.000000000 -0800
@@ -710,11 +710,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_c :=
+else
+REVISION_c := $(shell cat $(REVISION))
+endif
+
version := $(BASEVER_c)
# For use in version.c - double quoted strings, with appropriate
@@ -726,6 +733,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
@@ -1742,9 +1755,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 2006-01-23 10:30:19.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, DATESTAMP, DEVPHASE, and REVISION are defined by the
+ Makefile. */
-const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX;
+const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX REVISION;