This is the mail archive of the
mailing list for the GDB project.
[RFA] adjust src-release following the renaming of gdb/common/ to gdb/gdbsupport/
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: gdb-patches at sourceware dot org, Sergio Durigan Junior <sergiodj at redhat dot com>, Tom Tromey <tromey at adacore dot com>
- Date: Fri, 12 Jul 2019 16:12:56 -0700
- Subject: [RFA] 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.)
For those who have been getting snapshots from sourceware, this is also
why recent snapshots are missing.
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.
* src-release (getver): If $tool/gdbsupport/create-version.sh
exists, use that to determine the version number.
Tested on x86_64-linux, by running the src-release script with "gdb"
as the argument, and verifying that the name of the tarball is now
OK to push?
src-release.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src-release.sh b/src-release.sh
index 1654656146f..90d556896c9 100755
@@ -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