diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/find-clang-format.py | 4 | ||||
-rwxr-xr-x | bin/get-bugzilla-attachments-by-mimetype | 2 | ||||
-rwxr-xr-x | bin/oss-fuzz-build.sh | 2 | ||||
-rw-r--r-- | bin/sanitize-excludelist.txt (renamed from bin/sanitize-blacklist.txt) | 0 | ||||
-rwxr-xr-x | bin/symstore.sh | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/bin/find-clang-format.py b/bin/find-clang-format.py index 38c9aac10780..713174114488 100755 --- a/bin/find-clang-format.py +++ b/bin/find-clang-format.py @@ -11,7 +11,7 @@ from difflib import unified_diff from pathlib import Path from subprocess import PIPE, Popen -BLACKLIST = Path("solenv/clang-format/blacklist") +EXCLUDELIST = Path("solenv/clang-format/excludelist") THRESHOLD = os.getenv("CLANG_THRESHOLD", 5) CLANG_BINARY = Path(os.getenv("CLANG_FORMAT", "/opt/lo/bin/clang-format")) @@ -47,7 +47,7 @@ def main(*args): print("Couldn't find clang-format on {!s}".format(CLANG_BINARY)) exit(1) - for path in BLACKLIST.read_text().splitlines(): + for path in EXCLUDELIST.read_text().splitlines(): path = Path(path) if not path.exists(): continue diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index 1d1f45165a48..47669d04434a 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -356,7 +356,7 @@ rss_bugzillas = ( # does not add it back immediately .-) # 'novell': 'https://bugzilla.novell.com/buglist.cgi', # note: running this script against bz.apache.org apparently causes one's IP -# to be blacklisted or something; you won't get new files in any case... +# to be banned or something; you won't get new files in any case... # ( 'ooo', 'https://bz.apache.org/ooo/buglist.cgi' ), ( 'tdf', 'http://bugs.documentfoundation.org/buglist.cgi' ), ) diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh index 646accc8a017..ce4d110ce48a 100755 --- a/bin/oss-fuzz-build.sh +++ b/bin/oss-fuzz-build.sh @@ -7,7 +7,7 @@ fi #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use #the CXX as the linker and need to pass -stdlib=libc++ to build -export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-blacklist.txt" +export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt" #similarly force the -fsanitize etc args in as well as pthread to get #things to link successfully during the build export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread" diff --git a/bin/sanitize-blacklist.txt b/bin/sanitize-excludelist.txt index e3e995f1a02a..e3e995f1a02a 100644 --- a/bin/sanitize-blacklist.txt +++ b/bin/sanitize-excludelist.txt diff --git a/bin/symstore.sh b/bin/symstore.sh index 532efb16630f..c4e9870c9aa5 100755 --- a/bin/symstore.sh +++ b/bin/symstore.sh @@ -2,19 +2,19 @@ # Files listed here would not be store in the symbolestore-server. # The format is a string with files e.g. -# BLACKLIST="python.exe +# EXCLUDE_LIST="python.exe # file.dll # next_file.exe" # # It removes "python.exe", "file.dll", and "next_file.exe" from what's # added to the symstore. Separator is the newline -BLACK_LIST="python.exe" +EXCLUDE_LIST="python.exe" # List files here where it's ok for this script to find more than one # occurrence in the build tree. Files _not_ included here will generate # an error, if duplicates are found. # -# Same format as for BLACK_LIST above +# Same format as for EXCLUDE_LIST above MOREPDBS_OKLIST="libcurl.dll freebl3.dll libeay32.dll @@ -46,7 +46,7 @@ add_pdb() stats_morefound=0 declare -a pdball echo "Collect $extension" - ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$BLACK_LIST") + ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$EXCLUDE_LIST") while IFS= read -r file do ${VERBOSE} -n "Found: $file" |