Fix leftover remote test failures from PR binutils/19020

[deliverable/binutils-gdb.git] / src-release.sh

diff --git a/src-release.sh b/src-release.sh
index dad16492bac46899bcc061e67121a4ff62475656..64fa4c2120bfb81a02d99bc4e73b8b10ea6e8592 100755 (executable)
--- a/src-release.sh
+++ b/src-release.sh
@@ -42,7 +42,7 @@ DEVO_SUPPORT="README Makefile.in configure configure.ac \
        COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
        mkinstalldirs ltmain.sh missing ylwrap \
        libtool.m4 ltsugar.m4 ltversion.m4 ltoptions.m4 \
-       Makefile.def Makefile.tpl src-release config.rpath \
+       Makefile.def Makefile.tpl src-release.sh config.rpath \
        ChangeLog MAINTAINERS README-maintainer-mode \
        lt~obsolete.m4 ltgcc.m4 depcomp mkdep compile \
        COPYING3 COPYING3.LIB"
@@ -60,7 +60,7 @@ getver()
        bfd/configure --version | sed -n -e '1s,.* ,,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/' | sed 's/-cvs$//'
+       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
@@ -244,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -267,7 +268,7 @@ gdb_tar_compress()
 }
 
 # The FSF "binutils" release includes gprof and ld.
-BINUTILS_SUPPORT_DIRS="bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu"
+BINUTILS_SUPPORT_DIRS="bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu zlib"
 binutils_release()
 {
     compressors=$1
@@ -276,7 +277,7 @@ binutils_release()
     tar_compress $package $tool "$BINUTILS_SUPPORT_DIRS" "$compressors"
 }
 
-GAS_SUPPORT_DIRS="bfd include libiberty opcodes intl setup.com makefile.vms"
+GAS_SUPPORT_DIRS="bfd include libiberty opcodes intl setup.com makefile.vms zlib"
 gas_release()
 {
     compressors=$1
@@ -285,7 +286,7 @@ gas_release()
     tar_compress $package $tool "$GAS_SUPPORT_DIRS" "$compressors"
 }
 
-GDB_SUPPORT_DIRS="bfd include libiberty opcodes readline sim intl libdecnumber cpu"
+GDB_SUPPORT_DIRS="bfd include libiberty opcodes readline sim intl libdecnumber cpu zlib"
 gdb_release()
 {
     compressors=$1
@@ -295,13 +296,13 @@ gdb_release()
 }
 
 # Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in gdb/common/create-version.sh makefile.vms zlib"
 sim_release()
 {
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()