diff mbox

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

Message ID 20200128222514.10753-1-sergiodj@redhat.com
State New, archived
Headers

Commit Message

Sergio Durigan Junior Jan. 28, 2020, 10:25 p.m. UTC 
  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.

OK?

ChangeLog:
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.

Change-Id: Id3b8bed6583a1aaa120c07009366f6c94a62d5db
---
 src-release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Pedro Alves Jan. 29, 2020, 6:13 p.m. UTC | #1 
On 1/28/20 10:25 PM, Sergio Durigan Junior wrote:

> diff --git a/src-release.sh b/src-release.sh
> index 92e92ac5d7..b3ca5ae137 100755
> --- 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 -f ./gdbsupport/create-version.sh; then
> +	./gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp

It seems like this makes it so that the version.in fallback becomes unreachable.
./gdbsupport/create-version.sh is always going to exist irrespective of what
$tool is.  Maybe it would be better to check that $tool is "gdb" instead.

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/src-release.sh b/src-release.sh
index 92e92ac5d7..b3ca5ae137 100755
--- 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 -f ./gdbsupport/create-version.sh; 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