From d6c2da544627e23c87003859209152903dc7fcbc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Jun 2013 18:59:51 +0000 Subject: [PATCH] move version.in from gdb/common back to gdb This reverts part of the earlier version.in change. It moves version.in back to the gdb directory. This works around the CVS bug we've found. 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/ChangeLog | 8 ++++++++ gdb/Makefile.in | 2 +- gdb/common/create-version.sh | 2 +- gdb/doc/ChangeLog | 7 +++++++ gdb/doc/Makefile.in | 4 ++-- gdb/doc/gdbint.texinfo | 34 +++++++++++++++++----------------- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/Makefile.in | 2 +- gdb/{common => }/version.in | 0 sim/common/ChangeLog | 6 ++++++ sim/common/Make-common.in | 2 +- sim/common/create-version.sh | 2 +- sim/ppc/ChangeLog | 5 +++++ sim/ppc/Makefile.in | 2 +- 14 files changed, 56 insertions(+), 25 deletions(-) rename gdb/{common => }/version.in (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2a878ff10..adcaf5d184 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2013-06-28 Tom Tromey + + * Makefile.in (version.c): Use version.in, not + common/version.in. + * common/create-version.sh: Likewise. + * common/version.in: Move... + * version.in: ...here. + 2013-06-28 Pedro Alves * infrun.c (set_observer_mode): Don't declare pagination_enabled diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c27c03a6b4..aca5dbfc88 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 53d6173f26..0bdd0fd873 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/doc/ChangeLog b/gdb/doc/ChangeLog index afd66e6383..31beba8462 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,10 @@ +2013-06-28 Tom Tromey + + * Makefile.in (version.subst): Use version.in, not + common/version.in. + * gdbint.texinfo (Versions and Branches, Releasing GDB): + Likewise. + 2013-06-27 Pedro Alves * gdbint.texinfo (Algorithms) 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 749e121332..60805adfa6 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -6677,7 +6677,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} @@ -6781,7 +6781,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)}. @@ -6830,7 +6830,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)}. @@ -7108,16 +7108,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 @@ -7317,18 +7317,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 @@ -7573,7 +7573,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 @@ -7600,9 +7600,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/ChangeLog b/gdb/gdbserver/ChangeLog index b515af4e50..8f73480334 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2013-06-28 Tom Tromey + + * Makefile.in (version.c): Use version.in, not + common/version.in. + 2013-06-28 Mircea Gherzan * configure.ac (version_host, version_target): Set and AC_SUBST them. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 9053cf8634..db4e08689c 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -391,7 +391,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)/.. \ $(version_host) $(version_target) version.c diff --git a/gdb/common/version.in b/gdb/version.in similarity index 100% rename from gdb/common/version.in rename to gdb/version.in diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index cc0e9aa355..19ee5c470c 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2013-06-28 Tom Tromey + + * Make-common.in (version.c): Use version.in, not + common/version.in. + * create-version.sh: Likewise. + 2013-06-24 Joel Brobecker * create-version.sh: New script. Adapted from diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 769f782df4..afa3894aa3 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 aaf2ab359f..746427738a 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/ChangeLog b/sim/ppc/ChangeLog index 2f7da02972..8415cb43e7 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2013-06-28 Tom Tromey + + * Make-common.in (version.c): Use version.in, not + common/version.in. + 2013-06-24 Joel Brobecker * Makefile.in (srccom): New variable. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 1652b24816..75bb9c3e63 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)