This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] adjust src-release following the renaming of gdb/common/ to gdb/gdbsupport/


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=48b550c28afd21b382e21e56b7ba246b3bf49d4b

commit 48b550c28afd21b382e21e56b7ba246b3bf49d4b
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Sat Jul 13 18:00:32 2019 -0700

    adjust src-release following the renaming of gdb/common/ to gdb/gdbsupport/
    
    A recent change renamed the common/ directory into gdbsupport/ in gdb.
    This causes problems in the getver function in the src-release script
    which doesn't find the create-version.sh script anymore. As a result,
    it falls back on using the version.in file verbatim, meaning that
    the "DATE" placeholder doesn't get replaced with the snapshot date,
    and the "-git" suffix doesn't get stripped. More precisely, we get
    snapshots called "gdb-8.3.50-DATE-git.tar" instead of (e.g.)
    "gdb-8.3-20190712.tar".
    
    This commit fixes the issue by adding support for this situation.
    I left the support for $tool/common/create-version.sh, because
    the sim still uses that directory structure.
    
    ChangeLog:
    
            * src-release (getver): If $tool/gdbsupport/create-version.sh
            exists, use that to determine the version number.

Diff:
---
 ChangeLog      | 5 +++++
 src-release.sh | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1b7f860..52d97d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* src-release (getver): If $tool/gdbsupport/create-version.sh
+	exists, use that to determine the version number.
+
 2019-06-21  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* src-release.sh (GDB_SUPPORT_DIRS): Add gnulib.
diff --git a/src-release.sh b/src-release.sh
index 1654656..90d5568 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -61,6 +61,10 @@ getver()
 	$tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
 	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
         rm -f VER.tmp
+    elif test -f $tool/gdbsupport/create-version.sh; then
+	$tool/gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
+	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
+        rm -f VER.tmp
     elif test -f $tool/version.in; then
 	head -1 $tool/version.in
     else


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]