From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23406 invoked by alias); 27 Jun 2013 16:56:50 -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 23397 invoked by uid 89); 27 Jun 2013 16:56:50 -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; Thu, 27 Jun 2013 16:56:48 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5RGuiar032628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 Jun 2013 12:56:44 -0400 Received: from barimba (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5RGufRv019797 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 27 Jun 2013 12:56:42 -0400 From: Tom Tromey To: Hans-Peter Nilsson Cc: Joel Brobecker , gdb-patches@sourceware.org Subject: RFC: move common/version.in to gdb/ (Was: sim checkout broken) References: <1371835865-15879-1-git-send-email-tromey@redhat.com> <871u7rwodv.fsf@fleche.redhat.com> <20130624224138.GC5326@adacore.com> <87y59ythcd.fsf@fleche.redhat.com> <20130625142141.GF5326@adacore.com> <87ppvatfsp.fsf@fleche.redhat.com> <87bo6ute8b.fsf@fleche.redhat.com> <878v1wrghn.fsf@fleche.redhat.com> <87bo6spakh.fsf@fleche.redhat.com> <877ghfppcx.fsf@fleche.redhat.com> <87zjubo9x0.fsf@fleche.redhat.com> Date: Thu, 27 Jun 2013 17:09:00 -0000 In-Reply-To: <87zjubo9x0.fsf@fleche.redhat.com> (Tom Tromey's message of "Thu, 27 Jun 2013 09:22:51 -0600") Message-ID: <87vc4zo5km.fsf_-_@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-06/txt/msg00827.txt.bz2 Tom> I think moving the file out of 'common' should help. Here's the patch. Let me know what you think. Once it goes in I will update the modules file. I also have updated versions of my ARI and src-release patches that I will send. Tom gdb * Makefile.in (version.c): Use version.in, not common/version.in. * common/create-version.sh: Likewise. * common/version.in: Move... * version.in: ...here. gdb/doc * Makefile.in (version.subst): Use version.in, not common/version.in. * gdbint.texinfo (Versions and Branches, Releasing GDB): Likewise. gdb/gdbserver * Makefile.in (version.c): Use version.in, not common/version.in. sim/common * Make-common.in (version.c): Use version.in, not common/version.in. * create-version.sh: Likewise. sim/ppc: * Make-common.in (version.c): Use version.in, not common/version.in. --- gdb/Makefile.in | 2 +- gdb/common/create-version.sh | 2 +- gdb/common/version.in | 1 - gdb/doc/Makefile.in | 4 ++-- gdb/doc/gdbint.texinfo | 34 +++++++++++++++++----------------- gdb/gdbserver/Makefile.in | 2 +- gdb/version.in | 1 + sim/common/Make-common.in | 2 +- sim/common/create-version.sh | 2 +- sim/ppc/Makefile.in | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 gdb/common/version.in create mode 100644 gdb/version.in diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c27c03a..aca5dbf 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1421,7 +1421,7 @@ $(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 common/version.in $(srcdir)/../bfd/version.h $(srcdir)/common/create-version.sh +version.c: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/common/create-version.sh $(SHELL) $(srcdir)/common/create-version.sh $(srcdir) \ $(host_alias) $(target_alias) version.c diff --git a/gdb/common/create-version.sh b/gdb/common/create-version.sh index 53d6173..0bdd0fd 100755 --- a/gdb/common/create-version.sh +++ b/gdb/common/create-version.sh @@ -34,7 +34,7 @@ fi rm -f version.c-tmp $output version.tmp date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../bfd/version.h` -sed -e "s/DATE/$date/" < $srcdir/common/version.in > version.tmp +sed -e "s/DATE/$date/" < $srcdir/version.in > version.tmp echo '#include "version.h"' >> version.c-tmp echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp echo 'const char host_name[] = "'"$host_alias"'";' >> version.c-tmp diff --git a/gdb/common/version.in b/gdb/common/version.in deleted file mode 100644 index 99adaca..0000000 --- a/gdb/common/version.in +++ /dev/null @@ -1 +0,0 @@ -7.6.50.DATE-cvs diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index d4ab738..ba8dd39 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -396,9 +396,9 @@ GDBvn.texi : version.subst fi mv GDBvn.new GDBvn.texi -version.subst: $(gdbdir)/common/version.in $(gdbdir)/../bfd/version.h +version.subst: $(gdbdir)/version.in $(gdbdir)/../bfd/version.h date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $(gdbdir)/../bfd/version.h`; \ - sed -e "s/DATE/$$date/" < $(gdbdir)/common/version.in > version.subst + sed -e "s/DATE/$$date/" < $(gdbdir)/version.in > version.subst # Updated atomically .PRECIOUS: GDBvn.texi diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 8f82611..5aed3b3 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -6632,7 +6632,7 @@ Specific Information, gdb, Debugging with @value{GDBN}}). @section Versions @value{GDBN}'s version is determined by the file -@file{gdb/common/version.in} and takes one of the following forms: +@file{gdb/version.in} and takes one of the following forms: @table @asis @item @var{major}.@var{minor} @@ -6736,7 +6736,7 @@ branch tag, denoting the head of the branch, does not need this.} @cindex vendor branches To avoid version conflicts, vendors are expected to modify the file -@file{gdb/common/version.in} to include a vendor unique alphabetic identifier +@file{gdb/version.in} to include a vendor unique alphabetic identifier (an official @value{GDBN} release never uses alphabetic characters in its version identifier). E.g., @samp{6.2widgit2}, or @samp{6.2 (Widgit Inc Patch 2)}. @@ -6785,7 +6785,7 @@ The @value{GDBN} module @code{gdb} should be specified when creating a branch (branches of individual files should be avoided). @xref{Tags}. @item a branch shall be branded using @file{version.in} -The file @file{gdb/common/version.in} shall be modified so that it identifies +The file @file{gdb/version.in} shall be modified so that it identifies the branch @var{owner} and branch @var{name}, e.g., @samp{6.2.50.20030303_owner_name} or @samp{6.2 (Owner Name)}. @@ -7063,16 +7063,16 @@ $ echo $u $v$V 5.1 5_2 $ cd /tmp $ echo cvs -f -d :ext:sourceware.org:/cvs/src co \ --r gdb_$V-branch src/gdb/common/version.in +-r gdb_$V-branch src/gdb/version.in cvs -f -d :ext:sourceware.org:/cvs/src co - -r gdb_5_2-branch src/gdb/common/version.in + -r gdb_5_2-branch src/gdb/version.in $ ^echo ^^ -U src/gdb/common/version.in +U src/gdb/version.in $ cd src/gdb -$ echo $u.90-DATE-cvs > common/version.in -$ cat common/version.in +$ echo $u.90-DATE-cvs > version.in +$ cat version.in 5.1.90-DATE-cvs -$ cvs -f commit common/version.in +$ cvs -f commit version.in @end smallexample @itemize @bullet @@ -7272,18 +7272,18 @@ to get it updated.} @file{INSTALL} from the core documentation. This might be worth pursuing.} -@item gdb/common/version.in +@item gdb/version.in @smallexample -$ echo $v > gdb/src/gdb/common/version.in -$ cat gdb/src/gdb/common/version.in +$ echo $v > gdb/src/gdb/version.in +$ cat gdb/src/gdb/version.in 5.2 -$ emacs gdb/src/gdb/common/version.in +$ emacs gdb/src/gdb/version.in ... c-x 4 a ... Bump to version ... c-x c-s c-x c-c -$ cp gdb/src/gdb/common/version.in insight/src/gdb/common/version.in +$ cp gdb/src/gdb/version.in insight/src/gdb/version.in $ cp gdb/src/gdb/ChangeLog insight/src/gdb/ChangeLog @end smallexample @@ -7528,7 +7528,7 @@ In particular you'll need to commit any changes to: @item @file{gdb/ChangeLog} @item -@file{gdb/common/version.in} +@file{gdb/version.in} @item @file{gdb/NEWS} @item @@ -7555,9 +7555,9 @@ Insight is used since that contains more of the release than Just put something in the @file{ChangeLog} so that the trunk also indicates when the release was made. -@subsubheading Restart @file{gdb/common/version.in} +@subsubheading Restart @file{gdb/version.in} -If @file{gdb/common/version.in} does not have the string @samp{DATE} then +If @file{gdb/version.in} does not have the string @samp{DATE} then builds will not include the checkout date in their resulting version. Having committed all the release changes it can be set to @file{5.2.0_DATE-cvs} which will restart things. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index e5ecdd3..d6c3ea8 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -389,7 +389,7 @@ am--refresh: force: -version.c: Makefile $(srcdir)/../common/version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh +version.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \ $(host_alias) $(target_alias) version.c diff --git a/gdb/version.in b/gdb/version.in new file mode 100644 index 0000000..99adaca --- /dev/null +++ b/gdb/version.in @@ -0,0 +1 @@ +7.6.50.DATE-cvs diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 769f782..afa3894 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -300,7 +300,7 @@ stamp-tvals: gentmap $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c touch stamp-tvals -version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in +version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in $(SHELL) $(srccom)/create-version.sh $(srccom) version.c # diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh index aaf2ab3..7464277 100755 --- a/sim/common/create-version.sh +++ b/sim/common/create-version.sh @@ -26,7 +26,7 @@ output="$2" rm -f version.c-tmp $output version.tmp date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../../bfd/version.h` -sed -e "s/DATE/$date/" < $srcdir/../../gdb/common/version.in > version.tmp +sed -e "s/DATE/$date/" < $srcdir/../../gdb/version.in > version.tmp echo '#include "version.h"' >> version.c-tmp echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp mv version.c-tmp $output diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 1652b24..75bb9c3 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -563,7 +563,7 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ) $(RANLIB) $(TARGETLIB) -version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in +version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in $(SHELL) $(srccom)/create-version.sh $(srccom) version.c version.o: version.c $(version_h) -- 1.8.1.4