diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2013-08-29 22:25:41 +0400 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2013-08-29 22:25:41 +0400 |
| commit | 97390253a11a01eec0f30758ac67e6cdb7585d73 (patch) | |
| tree | 38408b0c7a667019fc95af210a8ad84786045ebd | |
| parent | 3e52e50c027acada72e4a98451f1dda1b7566029 (diff) | |
src-release: Strip "-cvs" suffix in version number.gdb_7_6_1-2013-08-30-releasegdb_7_6-branch
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
@@ -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 cba438492..e963aa987 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 \ |