aboutsummaryrefslogtreecommitdiffhomepage
path: root/build_tools
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-04-19 16:28:03 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2016-04-19 16:28:03 +0800
commit9aeed0dc06c4dc9b23701e56b62e9aa9de6e81d5 (patch)
tree344f8b83895bbb998c5c7469c0d5632c5a97cfaa /build_tools
parentc93e38380a1f1bed6c73846c4e3e6cf0b83b8471 (diff)
parentbf0e91cc97a7430f69d29e4448e36974581df902 (diff)
Merge branch 'Integration_2.3.0'
Merge the pcre2 10.20 to 10.21 update. Closes #2943.
Diffstat (limited to 'build_tools')
-rwxr-xr-xbuild_tools/lint.fish6
1 files changed, 3 insertions, 3 deletions
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index 9585d4e6..287269da 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -71,14 +71,14 @@ if set -q c_files[1]
oclint-xcodebuild xcodebuild.log > /dev/null
end
if test $all = yes
- oclint-json-compilation-database -e '/pcre2-10.20/' -- -enable-global-analysis 2>& 1
+ oclint-json-compilation-database -e '/pcre2-10.21/' -- -enable-global-analysis 2>& 1
else
set i_files
for f in $c_files
set i_files $i_files -i $f
end
- echo oclint-json-compilation-database -e '/pcre2-10.20/' $i_files
- oclint-json-compilation-database -e '/pcre2-10.20/' $i_files 2>& 1
+ echo oclint-json-compilation-database -e '/pcre2-10.21/' $i_files
+ oclint-json-compilation-database -e '/pcre2-10.21/' $i_files 2>& 1
end
else
# Presumably we're on Linux or other platform not requiring special