aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2013-08-17 01:07:52 +0000
committerJoel Brobecker <brobecker@adacore.com>2013-08-17 01:07:52 +0000
commit6f3dd43ee609156bff3f2928cd93621c35d13cff (patch)
tree014de6ed0ed56b2da192d33bd0bb2e49c5ae7b02
parent890d4161d821c3be63ecc8f65093380e98a192c3 (diff)
downloadnewlib-6f3dd43ee609156bff3f2928cd93621c35d13cff.zip
newlib-6f3dd43ee609156bff3f2928cd93621c35d13cff.tar.gz
newlib-6f3dd43ee609156bff3f2928cd93621c35d13cff.tar.bz2
src-release: Strip "-cvs" from GDB source dir and tarball.
The nightly snapshots we have been creating in the past did not include the "-cvs" suffix at the end of the version number. Snapshot packaging started breaking ever since GDB switched to using BFD's version number. Things got partially fixed with the previous change to this file, but the change missed the fact that the "-cvs" suffix in the tarball name (Eg: gdb-7.6.50-20130816-cvs.tar) is undesirable. This patch removes it. ChangeLog: * src-release (VER): When using $(TOOL)/common/create-version.sh, strip the "-cvs" suffix from the version number if present.
-rw-r--r--ChangeLog5
-rw-r--r--src-release2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23cf56b..f390fa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16 Joel Brobecker <brobecker@adacore.com>
+
+ * src-release (VER): When using $(TOOL)/common/create-version.sh,
+ strip the "-cvs" suffix from the version number if present.
+
2013-08-12 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* configure.ac: Sync with GCC repo.
diff --git a/src-release b/src-release
index cf6d266..c2f4727 100644
--- a/src-release
+++ b/src-release
@@ -74,7 +74,7 @@ VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null
$(TOOL)/common/create-version.sh $(TOOL) \
'dummy-host' 'dummy-target' \
VER.tmp; \
- cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/'; \
+ cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$$//'; \
rm -f VER.tmp; \
elif test -f $(TOOL)/version.in; then \
head -1 $(TOOL)/version.in; \