diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2013-08-29 18:25:41 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2013-08-29 18:25:41 +0000 |
| commit | 0b399ec16a611f6a6c172a2a5eb75b5d5b9b594c (patch) | |
| tree | 2c77af69a3bed77f464a5f4e5506ab604aeec2de | |
| parent | ea42503f0ddf41bc702c3c52fe85c8979f4627ab (diff) | |
| download | gdb-0b399ec16a611f6a6c172a2a5eb75b5d5b9b594c.tar.gz | |
src-release: Strip "-cvs" suffix in version number.
For some reason not understood, src-release produces tarballs where
the version number in the tarball name includes the "-cvs" suffix.
Looking at the snapshots produced in the past for CVS snashots,
the "-cvs" suffix was NOT included. This new -cvs suffix is therefore
now causing a mismatch between what the scripts expect and what this
makefile produces. This patch fixes the issue by stripping the "-cvs"
suffix, if present, from the version number.
ChangeLog:
* src-release (VER): Strip any "-cvs" suffix from the version
number, if extracted from $(TOOL)/version.in.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src-release | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a276e71c5ce..e884e8f36a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-29 Joel Brobecker <brobecker@adacore.com> + + * src-release (VER): Strip any "-cvs" suffix from the version + number, if extracted from $(TOOL)/version.in. + 2013-02-15 Yufeng Zhang <yufeng.zhang@arm.com> * configure.ac: Sync with GCC repo. diff --git a/src-release b/src-release index cba43849241..e963aa98704 100644 --- a/src-release +++ b/src-release @@ -71,7 +71,7 @@ VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \ elif test -f $(TOOL)/version.in; then \ - head -1 $(TOOL)/version.in; \ + head -1 $(TOOL)/version.in | sed 's/-cvs$$//'; \ elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \ sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \ else \ |