From 7539e41e9fd1fc8ffa2dcce49f86441305a3d620 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 22 Jul 2013 15:17:20 +0000 Subject: [PATCH] src-release: Fix VER computation for TOOL=gdb Without this patch, the DATE marker in gdb/version.in does not get replaced by the source packaging date, causing the name of the tarball being created to: have the DATE marker in the tarball name and the name of the directory the sources unpack to (Eg: gdb-7.6.50-DATE-cvs.tar instead of gdb-7.6.50-20130710-cvs.tar). ChangeLog: * src-release (VER): Use $(TOOL)/common/create-version.sh if it exists. --- ChangeLog | 5 +++++ src-release | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5158cdd..fb46159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-07-22 Joel Brobecker + + * src-release (VER): Use $(TOOL)/common/create-version.sh + if it exists. + 2013-07-10 Jack Howarth PR target/57792 diff --git a/src-release b/src-release index c388cbe..cf6d266 100644 --- a/src-release +++ b/src-release @@ -70,6 +70,12 @@ VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null bfd/configure --version | sed -n -e '1s,.* ,,p'; \ 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)/common/create-version.sh; then \ + $(TOOL)/common/create-version.sh $(TOOL) \ + 'dummy-host' 'dummy-target' \ + VER.tmp; \ + cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/'; \ + rm -f VER.tmp; \ elif test -f $(TOOL)/version.in; then \ head -1 $(TOOL)/version.in; \ elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \ -- 2.7.4