More descriptive exclusion error; updated docs and copyright
parent
dc983e7d68
commit
3f181b6192
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue