Merge pull request #225 from tbirdso/bump-zstd

Author: dzenanz

scripts/dockcross-manylinux-build-tarball.sh

@@ -7,16 +7,44 @@
 if test -d /home/kitware/Packaging; then
   cd /home/kitware/Packaging
 fi
-zstd_exe=zstd
-if test -e /home/kitware/Support/zstd-build/programs/zstd; then
+
+# -----------------------------------------------------------------------
+
+zstd_exe=`(which zstd)`
+if [[ -z ${zstd_exe} && -e /home/kitware/Support/zstd-build/programs/zstd ]]; then
   zstd_exe=/home/kitware/Support/zstd-build/programs/zstd
 fi
+
+# Find an appropriately versioned zstd.
+#
+# "--long" is introduced in zstd==v1.3.2
+# https://github.com/facebook/zstd/releases/tag/v1.3.2
+#
+# Sample --version output:
+# *** zstd command line interface 64-bits v1.4.4, by Yann Collet *** #
+ZSTD_MIN_VERSION="1.3.2"
+
+if [[ -n `(which dpkg)` && `(${zstd_exe} --version)` =~ v([0-9]+.[0-9]+.[0-9]+) ]]; then
+  if $(dpkg --compare-versions ${BASH_REMATCH[1]} "ge" ${ZSTD_MIN_VERSION} ); then
+    echo "Found zstd v${BASH_REMATCH[1]} at ${zstd_exe}"
+  else
+    echo "Expected zstd v${ZSTD_MIN_VERSION} or higher but found v${BASH_REMATCH[1]} at ${zstd_exe}"
+    exit 255
+  fi
+else
+  # dpkg not available for version comparison so simply print version
+  ${zstd_exe} --version
+fi
+
+# -----------------------------------------------------------------------
+
 tar -c --to-stdout \
   ITKPythonPackage/ITK-* \
   ITKPythonPackage/oneTBB* \
   ITKPythonPackage/scripts > ITKPythonBuilds-linux.tar
 $zstd_exe -f \
   -10 \
   -T6 \
+  --long=31 \
   ./ITKPythonBuilds-linux.tar \
   -o ./ITKPythonBuilds-linux.tar.zst

scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh

@@ -35,17 +35,17 @@ do
 done
 # -----------------------------------------------------------------------
 
-# Packages distributed by github are in zstd format, so we need to download that binary to uncompress
-if [[ ! -f zstd-1.2.0-linux.tar.gz ]]; then
-  curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o zstd-1.2.0-linux.tar.gz
-  gunzip -d zstd-1.2.0-linux.tar.gz
-  tar xf zstd-1.2.0-linux.tar
-fi
-if [[ ! -f ./zstd-1.2.0-linux/bin/unzstd ]]; then
-  echo "ERROR: can not find required binary './zstd-1.2.0-linux/bin/unzstd'"
+# Verifies that unzstd binary is available to decompress ITK build archives.
+unzstd_exe=`(which unzstd)`
+
+if [[ -z ${unzstd_exe} ]]; then
+  echo "ERROR: can not find required binary 'unzstd' "
   exit 255
 fi
 
+# Expect unzstd > v1.3.2, see discussion in `dockcross-manylinux-build-tarball.sh`
+${unzstd_exe} --version
+
 TARBALL_NAME="ITKPythonBuilds-linux${TARBALL_SPECIALIZATION}.tar"
 
 if [[ ! -f ${TARBALL_NAME}.zst ]]; then
@@ -55,7 +55,7 @@ if [[ ! -f ./${TARBALL_NAME}.zst ]]; then
   echo "ERROR: can not find required binary './${TARBALL_NAME}.zst'"
   exit 255
 fi
-./zstd-1.2.0-linux/bin/unzstd ./${TARBALL_NAME}.zst -o ${TARBALL_NAME}
+${unzstd_exe} --long=31 ./${TARBALL_NAME}.zst -o ${TARBALL_NAME}
 if [ "$#" -lt 1 ]; then
   echo "Extracting all files";
   tar xf ${TARBALL_NAME}