From 79acfb39aaab7f3b34e94dfe9228384088984e7e Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 26 Mar 2020 19:50:36 -0700 Subject: Enabled format validation on Linux --- BuildTools/FormatValidation/clang-format_10.0.0 | Bin 2349840 -> 0 bytes BuildTools/FormatValidation/clang-format_linux_10.0.0 | Bin 0 -> 2265160 bytes BuildTools/FormatValidation/clang-format_mac_10.0.0 | Bin 0 -> 2349840 bytes BuildTools/FormatValidation/validate_format_linux.sh | 13 ++++++------- BuildTools/FormatValidation/validate_format_mac.sh | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100755 BuildTools/FormatValidation/clang-format_10.0.0 create mode 100755 BuildTools/FormatValidation/clang-format_linux_10.0.0 create mode 100755 BuildTools/FormatValidation/clang-format_mac_10.0.0 (limited to 'BuildTools') diff --git a/BuildTools/FormatValidation/clang-format_10.0.0 b/BuildTools/FormatValidation/clang-format_10.0.0 deleted file mode 100755 index cf170123..00000000 Binary files a/BuildTools/FormatValidation/clang-format_10.0.0 and /dev/null differ diff --git a/BuildTools/FormatValidation/clang-format_linux_10.0.0 b/BuildTools/FormatValidation/clang-format_linux_10.0.0 new file mode 100755 index 00000000..c3b9422c Binary files /dev/null and b/BuildTools/FormatValidation/clang-format_linux_10.0.0 differ diff --git a/BuildTools/FormatValidation/clang-format_mac_10.0.0 b/BuildTools/FormatValidation/clang-format_mac_10.0.0 new file mode 100755 index 00000000..cf170123 Binary files /dev/null and b/BuildTools/FormatValidation/clang-format_mac_10.0.0 differ diff --git a/BuildTools/FormatValidation/validate_format_linux.sh b/BuildTools/FormatValidation/validate_format_linux.sh index 7400e26b..07d583a4 100755 --- a/BuildTools/FormatValidation/validate_format_linux.sh +++ b/BuildTools/FormatValidation/validate_format_linux.sh @@ -1,8 +1,7 @@ #!/bin/bash -#python clang-format-validate.py -r \ -# --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \ -# --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \ -# --exclude ../../Graphics/GraphicsEngineVulkan/shaders/* \ -# ../../Common ../../Graphics ../../Platforms ../../Primitives -echo "Format validation is not yet enabled for DiligentCore module on Linux" - +python clang-format-validate.py --clang-format-executable ./clang-format_linux_10.0.0 \ +-r ../../Common ../../Graphics ../../Platforms ../../Primitives ../../Tests \ +--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \ +--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \ +--exclude ../../Graphics/GraphicsEngineVulkan/shaders/GenerateMipsCS_inc.h \ +--exclude ../../Tests/DiligentCoreAPITest/assets/* diff --git a/BuildTools/FormatValidation/validate_format_mac.sh b/BuildTools/FormatValidation/validate_format_mac.sh index cbb4cdf5..e90ba762 100755 --- a/BuildTools/FormatValidation/validate_format_mac.sh +++ b/BuildTools/FormatValidation/validate_format_mac.sh @@ -1,5 +1,5 @@ #!/bin/bash -python clang-format-validate.py --clang-format-executable ./clang-format_10.0.0 \ +python clang-format-validate.py --clang-format-executable ./clang-format_mac_10.0.0 \ -r ../../Common ../../Graphics ../../Platforms ../../Primitives ../../Tests \ --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \ --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \ -- cgit v1.2.3