[PATCH] don't keep a gdb-specific date

[PATCH] don't keep a gdb-specific date

[Tom Tromey]

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

Re: [PATCH] don't keep a gdb-specific date

[Pedro Alves]

On 06/19/2013 06:17 PM, Tom Tromey wrote:
> 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.

What about gdbserver?  I suspect it'll print literal
"7.6.50.DATE-cvs" as version date with this patch.

-- 
Pedro Alves

Re: [PATCH] don't keep a gdb-specific date

[Tom Tromey]

Pedro> What about gdbserver?  I suspect it'll print literal
Pedro> "7.6.50.DATE-cvs" as version date with this patch.

Darn it, I remembered gdbserver when I was thinking about this, and then
forgot it when writing the patch.  I'll fix it up now.

Tom