OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tom Tromey 2013-06-28 18:59:51 +00:00
parent 74da6f00a3
commit d6c2da5446
14 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2013-06-28 Tom Tromey <tromey@redhat.com>
* 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 <palves@redhat.com>
* infrun.c (set_observer_mode): Don't declare pagination_enabled

2
gdb/Makefile.in
View File

@ -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

2
gdb/common/create-version.sh
View File

@ -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

7
gdb/doc/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-28 Tom Tromey <tromey@redhat.com>
* Makefile.in (version.subst): Use version.in, not
common/version.in.
* gdbint.texinfo (Versions and Branches, Releasing GDB):
Likewise.
2013-06-27 Pedro Alves <palves@redhat.com>
* gdbint.texinfo (Algorithms) <Stepping over runtime loader

4
gdb/doc/Makefile.in
View File

@ -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

34
gdb/doc/gdbint.texinfo
View File

@ -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.

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-28 Tom Tromey <tromey@redhat.com>
* Makefile.in (version.c): Use version.in, not
common/version.in.
2013-06-28 Mircea Gherzan <mircea.gherzan@intel.com>
* configure.ac (version_host, version_target): Set and AC_SUBST them.

2
gdb/gdbserver/Makefile.in
View File

@ -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

0
gdb/common/version.in → gdb/version.in
View File

6
sim/common/ChangeLog
View File

@ -1,3 +1,9 @@
2013-06-28 Tom Tromey <tromey@redhat.com>
* Make-common.in (version.c): Use version.in, not
common/version.in.
* create-version.sh: Likewise.
2013-06-24 Joel Brobecker <brobecker@adacore.com>
* create-version.sh: New script. Adapted from

2
sim/common/Make-common.in
View File

@ -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
#

2
sim/common/create-version.sh
View File

@ -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

5
sim/ppc/ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-28 Tom Tromey <tromey@redhat.com>
* Make-common.in (version.c): Use version.in, not
common/version.in.
2013-06-24 Joel Brobecker <brobecker@adacore.com>
* Makefile.in (srccom): New variable.

2
sim/ppc/Makefile.in
View File

@ -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)