From: Yann Collet <cyan@fb.com>
Date: Wed, 28 Aug 2019 19:17:29 +0000 (-0700)
Subject: Merge branch 'dev' into decTest
X-Git-Tag: v1.4.4~1^2~66^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af941d2d7ed418f7e7cee11e4374ae991e89013;p=thirdparty%2Fzstd.git

Merge branch 'dev' into decTest
---

8af941d2d7ed418f7e7cee11e4374ae991e89013
diff --cc contrib/single_file_decoder/create_single_file_decoder.sh
index 49f14cbd3,000000000..5f6ba2977
mode 100755,000000..100755
--- a/contrib/single_file_decoder/create_single_file_decoder.sh
+++ b/contrib/single_file_decoder/create_single_file_decoder.sh
@@@ -1,14 -1,0 +1,15 @@@
 +#!/bin/bash
 +
 +# Where to find the sources
 +ZSTD_SRC_ROOT="../../lib"
 +
 +
 +# Amalgamate the sources
++echo "Amalgamating files... this can take a while"
 +./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c
 +# Did combining work?
 +if [ $? -ne 0 ]; then
 +  echo "Combine script: FAILED"
 +  exit 1
 +fi
 +echo "Combine script: PASSED"