lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support spaces in clang-format path

Browse Source 
This allows setting the CLANG_FORMAT environment variable to (e.g.)
`C:/Program Files/LLVM3.8.1/bin/clang-format.exe` and then using the
script from Git Bash on Windows. Before, it would break if there
were spaces in the path. (If a suitable clang-format were in the PATH
environment variable, though, I don't think spaces caused problems.)
This commit is contained in:
William Pearson
2023-04-11 15:27:45 -07:00
committed by Baldur Karlsson
parent 1c925494ef
commit e6fb67c1e1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/clang_format_all.sh
+4 -4
View File
@@ -15,8 +15,8 @@ CLANG_FORMAT_VERSION=$CLANG_MAJOR.$CLANG_MINOR
# define a function to check the current $CLANG_FORMAT
valid_clang_format() {
if which $CLANG_FORMAT > /dev/null 2>&1; then
if $CLANG_FORMAT --version | grep -q $CLANG_FORMAT_VERSION; then
if which "$CLANG_FORMAT" > /dev/null 2>&1; then
if "$CLANG_FORMAT" --version | grep -q $CLANG_FORMAT_VERSION; then
echo "Located $CLANG_FORMAT";
return 0;
fi
@@ -27,7 +27,7 @@ valid_clang_format() {
if ! valid_clang_format; then
# if not valid yet, first try the command line parameter
CLANG_FORMAT=$1
CLANG_FORMAT="$1"
fi;
if ! valid_clang_format; then
@@ -57,4 +57,4 @@ if ! valid_clang_format; then
fi;
# Search through the code that should be formatted, exclude any non-renderdoc code.
find qrenderdoc/ renderdoc/ renderdoccmd/ renderdocshim/ util/test/demos/ -name "3rdparty" -prune -o -name "official" -prune -o -print | grep -E ".*\.(h|c|cpp|m|mm|inl|geom|frag|vert|comp|hlsl)$" | grep -E -v "resource.h$" | awk '{printf("%s%c",$0,0)}' | xargs -0 -n1 $CLANG_FORMAT -i -style=file
find qrenderdoc/ renderdoc/ renderdoccmd/ renderdocshim/ util/test/demos/ -name "3rdparty" -prune -o -name "official" -prune -o -print | grep -E ".*\.(h|c|cpp|m|mm|inl|geom|frag|vert|comp|hlsl)$" | grep -E -v "resource.h$" | awk '{printf("%s%c",$0,0)}' | xargs -0 -n1 "$CLANG_FORMAT" -i -style=file