Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [PATCH] don't keep a gdb-specific date
Date: Wed, 19 Jun 2013 17:24:00 -0000	[thread overview]
Message-ID: <1371662226-10926-1-git-send-email-tromey@redhat.com> (raw)

Right now there are two nightly commits to update a file in the tree
with the current date.  One commit is for BFD, one is for gdb.

It seems unnecessary to me to do this twice.  We can make do with a
single such commit.

This patch changes gdb in a minimal way to reuse the BFD date -- it
extracts it from bfdver.h and changes version.in to use the
placeholder string "DATE" for those times when a date is wanted.

I remove the cron job that updates the version on trunk, and then
check in this patch.

For release branches, we can keep the cron job, but just tell it to
rewrite bfd/version.h.  I believe this is a simple change in the
crontab -- the script will work just fine on this file.
---
 gdb/Makefile.in | 9 ++++++---
 gdb/version.in  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a6336a2..00175c3 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1420,13 +1420,16 @@ $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ $(srcdir)/../COPYING3 $(srcdir)/copy
 		< $(srcdir)/../COPYING3 > $(srcdir)/copying.tmp
 	mv $(srcdir)/copying.tmp $(srcdir)/copying.c
 
-version.c: Makefile version.in
-	rm -f version.c-tmp version.c
+version.c: Makefile version.in ../bfd/bfdver.h
+	rm -f version.c-tmp version.c version.tmp
+	date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' ../bfd/bfdver.h`; \
+	sed -e "s/DATE/$$date/" < $(srcdir)/version.in > version.tmp
 	echo '#include "version.h"' >> version.c-tmp
-	echo 'const char version[] = "'"`sed q ${srcdir}/version.in`"'";' >> version.c-tmp
+	echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
 	echo 'const char host_name[] = "$(host_alias)";' >> version.c-tmp
 	echo 'const char target_name[] = "$(target_alias)";' >> version.c-tmp
 	mv version.c-tmp version.c
+	rm -f version.tmp
 
 observer.h: observer.sh doc/observer.texi
 	${srcdir}/observer.sh h ${srcdir}/doc/observer.texi observer.h
diff --git a/gdb/version.in b/gdb/version.in
index 5af97ee..99adaca 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.6.50.20130619-cvs
+7.6.50.DATE-cvs
-- 
1.8.1.4


             reply	other threads:[~2013-06-19 17:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-19 17:24 Tom Tromey [this message]
2013-06-19 17:37 ` Pedro Alves
2013-06-19 18:13   ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371662226-10926-1-git-send-email-tromey@redhat.com \
    --to=tromey@redhat.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox