From: Daniel Arndt Date: Fri, 11 Jun 2021 20:43:16 +0000 (-0400) Subject: Update infrastructure some more X-Git-Tag: v9.4.0-rc1~1119^2~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11bccaac816740d487dd6bb3c5c738bc2b5f5e15;p=dealii.git Update infrastructure some more --- diff --git a/contrib/utilities/download_clang_format b/contrib/utilities/download_clang_format index 76aa3862c8..e349474dfd 100755 --- a/contrib/utilities/download_clang_format +++ b/contrib/utilities/download_clang_format @@ -25,21 +25,16 @@ # PRG="$(cd "$(dirname "$0")" && pwd)/programs" -CLANG_PATH="${PRG}/clang-6" +CLANG_PATH="${PRG}/clang-11" URL="https://github.com/dealii/dealii/releases/download/v9.0.0" # Find out which kind of OS we are running and set the appropriate settings case "${OSTYPE}" in linux*) - FILENAME="clang-format-6-linux.tar.gz" + FILENAME="clang-format-11-linux.tar.gz" CHECKSUM_CMD="sha256sum" - CHECKSUM="26c046456d0a8c109df74e890f46bbe4ad50b035a9febc13ec41c22dabd005a5 $FILENAME" - ;; - darwin*) - FILENAME="clang-format-6-darwin.tar.gz" - CHECKSUM_CMD="shasum" - CHECKSUM="8eaf852cc96947245de706f1059e764b7086a82e8bd769da2654936acb1d63e0 $FILENAME" + CHECKSUM="a25874e0d5691aa6472061eb843890a8ad09094fb0ab2aab3f412d8762d494b3 $FILENAME" ;; *) echo "unknown: ${OSTYPE}" @@ -59,7 +54,7 @@ then exit 1 fi -echo "Downloading and installing clang-format-6 from ${URL}/${FILENAME}" +echo "Downloading and installing clang-format-11 from ${URL}/${FILENAME}" mkdir "${CLANG_PATH}" tmpdir="${TMPDIR:-/tmp}/dealiiclang${RANDOM}${RANDOM}" diff --git a/contrib/utilities/indent b/contrib/utilities/indent index 8eb39b40a6..90f803493c 100755 --- a/contrib/utilities/indent +++ b/contrib/utilities/indent @@ -27,9 +27,9 @@ # # The script can be invoked with DEAL_II_CLANG_FORMAT to change # the default version of clang-format. For example: -# DEAL_II_CLANG_FORMAT=clang-format-6.0 ./contrib/utilities/indent +# DEAL_II_CLANG_FORMAT=clang-format-11.0 ./contrib/utilities/indent # or, -# make DEAL_II_CLANG_FORMAT="clang-format-6.0" indent +# make DEAL_II_CLANG_FORMAT="clang-format-11.0" indent # # Note: If the script is invoked with REPORT_ONLY=true set, # REPORT_ONLY=true ./contrib/utilities/indent diff --git a/contrib/utilities/indent-all b/contrib/utilities/indent-all index 949b2af9cf..7e9e2eefaf 100755 --- a/contrib/utilities/indent-all +++ b/contrib/utilities/indent-all @@ -31,9 +31,9 @@ # # The script can be invoked with DEAL_II_CLANG_FORMAT to change # the default version of clang-format. For example: -# DEAL_II_CLANG_FORMAT=clang-format-6.0 ./contrib/utilities/indent +# DEAL_II_CLANG_FORMAT=clang-format-11.0 ./contrib/utilities/indent # or, -# make DEAL_II_CLANG_FORMAT="clang-format-6.0" indent +# make DEAL_II_CLANG_FORMAT="clang-format-11.0" indent # # Note: If the script is invoked with REPORT_ONLY=true set, # REPORT_ONLY=true ./contrib/utilities/indent-all diff --git a/contrib/utilities/indent.py b/contrib/utilities/indent.py index 82ba521487..5e6c4b48c1 100644 --- a/contrib/utilities/indent.py +++ b/contrib/utilities/indent.py @@ -289,11 +289,11 @@ if __name__ == "__main__": # # If clang-format-binary is not found, search again in - # contrib/utlitlies/programs/clang-6/bin + # contrib/utlitlies/programs/clang-11/bin # if not PARSED_ARGUMENTS.clang_format_binary: os.environ["PATH"] += ':' + \ - os.getcwd() + "/contrib/utilities/programs/clang-6/bin" + os.getcwd() + "/contrib/utilities/programs/clang-11/bin" PARSED_ARGUMENTS.clang_format_binary = distutils.spawn.find_executable( "clang-format")