From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30203 invoked by alias); 19 Jun 2013 18:13:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 30170 invoked by uid 89); 19 Jun 2013 18:13:20 -0000 X-Spam-SWARE-Status: No, score=-6.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 19 Jun 2013 18:13:13 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5JIDCd0015820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Jun 2013 14:13:12 -0400 Received: from barimba.redhat.com (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5JIDBT3005520; Wed, 19 Jun 2013 14:13:11 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2] don't keep a gdb-specific date Date: Wed, 19 Jun 2013 18:23:00 -0000 Message-Id: <1371665585-32104-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-06/txt/msg00506.txt.bz2 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. * Makefile.in (version.c): Use bfd/version.h. * version.in: Replace date with "DATE". * Makefile.in (version.c): Use bfd/version.h. --- gdb/Makefile.in | 9 ++++++--- gdb/gdbserver/Makefile.in | 9 ++++++--- gdb/version.in | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a6336a2..7932eef 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 $(srcdir)/../bfd/version.h + rm -f version.c-tmp version.c version.tmp + date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $(srcdir)/../bfd/version.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/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index e8470a8..067302d 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -389,12 +389,15 @@ am--refresh: force: -version.c: Makefile $(srcdir)/../version.in - rm -f version.c-tmp version.c +version.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h + rm -f version.c-tmp version.c version.tmp + date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $(srcdir)/../../bfd/version.h`; \ + sed -e "s/DATE/$$date/" < $(srcdir)/../version.in > version.tmp echo '#include "server.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 mv version.c-tmp version.c + rm -f version.tmp version.o: version.c $(server_h) xml-builtin.c: stamp-xml; @true 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