This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit/7.6] src-release: Strip "-cvs" suffix in version number.
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 29 Aug 2013 11:23:00 -0700
- Subject: [commit/7.6] src-release: Strip "-cvs" suffix in version number.
- Authentication-results: sourceware.org; auth=none
Hello,
The intent of this patch is to fix the remaining errors we still get
while trying to produce nightly snapshots. The snapshots for HEAD
have been working for a while, but we are still getting errors on
the branch side (7.6).
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.
This is very similar to a change I made on the HEAD, with similar
symptoms.
ChangeLog:
* src-release (VER): Strip any "-cvs" suffix from the version
number, if extracted from $(TOOL)/version.in.
Tested on x86_64-linux. Checking in shortly after sending this
message...
---
src-release | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src-release b/src-release
index cba4384..e963aa9 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 \
--
1.7.10.4