From: Carl Woffenden <cwoffenden@gmail.com>
Date: Thu, 20 Jan 2022 13:50:31 +0000 (+0100)
Subject: More descriptive exclusion error; updated docs and copyright
X-Git-Tag: v1.5.4^2~267^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f181b61927b0f517b11ddec2ca43490b6de693f;p=thirdparty%2Fzstd.git

More descriptive exclusion error; updated docs and copyright
---

diff --git a/build/single_file_libs/combine.py b/build/single_file_libs/combine.py
index 6443edad3..badd68a91 100755
--- a/build/single_file_libs/combine.py
+++ b/build/single_file_libs/combine.py
@@ -171,7 +171,7 @@ def add_file(file: Path, file_name: str = None) -> None:
                     if (resolved):
                         if (resolved in excludes):
                             # The file was excluded so error if the compiler uses it
-                            write_line(f'#error Using excluded file: {inc_name}')
+                            write_line(f'#error Using excluded file: {inc_name} (re-amalgamate source to fix)')
                             error_line(f'Excluding: {inc_name}')
                         else:
                             if (resolved not in found):
diff --git a/build/single_file_libs/combine.sh b/build/single_file_libs/combine.sh
index 674a5a275..a4933bf21 100755
--- a/build/single_file_libs/combine.sh
+++ b/build/single_file_libs/combine.sh
@@ -130,7 +130,7 @@ add_file() {
         local res_inc="$(resolve_include "$srcdir" "$inc")"
         if list_has_item "$XINCS" "$inc"; then
           # The file was excluded so error if the source attempts to use it
-          write_line "#error Using excluded file: $inc"
+          write_line "#error Using excluded file: $inc (re-amalgamate source to fix)"
           log_line "Excluding: $inc"
         else
           if ! list_has_item "$FOUND" "$res_inc"; then
diff --git a/build/single_file_libs/zstd-in.c b/build/single_file_libs/zstd-in.c
index c22e4cd97..eecd9a688 100644
--- a/build/single_file_libs/zstd-in.c
+++ b/build/single_file_libs/zstd-in.c
@@ -4,11 +4,11 @@
  *
  * Generate using:
  * \code
- *	combine.sh -r ../../lib -x legacy/zstd_legacy.h -o zstd.c zstd-in.c
+ *	python combine.py -r ../../lib -x legacy/zstd_legacy.h -o zstd.c zstd-in.c
  * \endcode
  */
 /*
- * Copyright (c) 2016-2021, Yann Collet, Facebook, Inc.
+ * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under both the BSD-style license (found in the
@@ -28,6 +28,10 @@
  * Note: the undefs for xxHash allow Zstd's implementation to coincide with with
  * standalone xxHash usage (with global defines).
  *
+ * Note: if you enable ZSTD_LEGACY_SUPPORT the combine.py script will need
+ * re-running without the "-x legacy/zstd_legacy.h" option (it excludes the
+ * legacy support at the source level).
+ *
  * Note: multithreading is enabled for all platforms apart from Emscripten.
  */
 #define DEBUGLEVEL 0
diff --git a/build/single_file_libs/zstddeclib-in.c b/build/single_file_libs/zstddeclib-in.c
index 42c510736..d0343c54a 100644
--- a/build/single_file_libs/zstddeclib-in.c
+++ b/build/single_file_libs/zstddeclib-in.c
@@ -4,11 +4,11 @@
  *
  * Generate using:
  * \code
- *	combine.sh -r ../../lib -x legacy/zstd_legacy.h -o zstddeclib.c zstddeclib-in.c
+ *	python combine.py -r ../../lib -x legacy/zstd_legacy.h -o zstddeclib.c zstddeclib-in.c
  * \endcode
  */
 /*
- * Copyright (c) 2016-2021, Yann Collet, Facebook, Inc.
+ * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under both the BSD-style license (found in the
@@ -27,6 +27,10 @@
  *
  * Note: the undefs for xxHash allow Zstd's implementation to coincide with with
  * standalone xxHash usage (with global defines).
+ *
+ * Note: if you enable ZSTD_LEGACY_SUPPORT the combine.py script will need
+ * re-running without the "-x legacy/zstd_legacy.h" option (it excludes the
+ * legacy support at the source level).
  */
 #define DEBUGLEVEL 0
 #define MEM_MODULE