Adjust src-release.sh's getver due to gdbsupport's move to toplevel

The move of gdbsupport to the top level directory requires a small
change to src-release.sh's "getver" function, which is responsible for
determining the version string that will be appended to the release
tarball: now the create-version.sh script lives under ./gdbsupport,
and not under gdb/gdbsupport anymore.

This patch unbreaks the snapshot generation, which hasn't been working
since January 14th.

ChangeLog:
2020-01-29  Sergio Durigan Junior  <sergiodj@redhat.com>

	* src-release.sh (getver): Look for gdbsupport's
	create-version.sh script at the current directory if tool is
	"gdb".

Change-Id: Id3b8bed6583a1aaa120c07009366f6c94a62d5db

diff --git a/ChangeLog b/ChangeLog
index 582d1f27704688934176d730f621f4e7460e3aa8..3b835d0c090ca868a8b8c50467feb5a00a3b8ca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-28  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+       * src-release.sh (getver): Look for gdbsupport's
+       create-version.sh script at the current directory if tool is
+       "gdb".
+
 2020-01-19  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * remote-sim.c (gdbsim_target::wait): Return

diff --git a/src-release.sh b/src-release.sh
index 92e92ac5d774e4523b2405ec80b1f816a5df6b9f..1de971eb01adb7c35bdb78b322b8ba2559b52aa8 100755 (executable)
--- a/src-release.sh
+++ b/src-release.sh
@@ -61,8 +61,8 @@ 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
+    elif test $tool = "gdb"; then
+       ./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