Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-dev-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-dev-tools
Commits
d230f216
Commit
d230f216
authored
5 years ago
by
Brecht Van Lommel
Browse files
Options
Downloads
Patches
Plain Diff
Increase clang-format recommended version range to 9.0.1
Ref 73747
parent
4a1328af
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
utils_maintenance/clang_format_paths.py
+3
-3
3 additions, 3 deletions
utils_maintenance/clang_format_paths.py
with
3 additions
and
3 deletions
utils_maintenance/clang_format_paths.py
+
3
−
3
View file @
d230f216
...
@@ -6,7 +6,7 @@ import sys
...
@@ -6,7 +6,7 @@ import sys
import
subprocess
import
subprocess
VERSION_MIN
=
(
6
,
0
,
0
)
VERSION_MIN
=
(
6
,
0
,
0
)
VERSION_MAX_RECOMMENDED
=
(
7
,
0
,
0
)
VERSION_MAX_RECOMMENDED
=
(
9
,
0
,
1
)
CLANG_FORMAT_CMD
=
"
clang-format
"
CLANG_FORMAT_CMD
=
"
clang-format
"
BASE_DIR
=
os
.
path
.
normpath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"
..
"
,
"
..
"
,
"
..
"
))
BASE_DIR
=
os
.
path
.
normpath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"
..
"
,
"
..
"
,
"
..
"
))
...
@@ -113,7 +113,7 @@ def clang_format_ensure_version():
...
@@ -113,7 +113,7 @@ def clang_format_ensure_version():
version
=
version
.
split
(
"
-
"
)[
0
]
version
=
version
.
split
(
"
-
"
)[
0
]
version
=
tuple
(
int
(
n
)
for
n
in
version
.
split
(
"
.
"
))
version
=
tuple
(
int
(
n
)
for
n
in
version
.
split
(
"
.
"
))
if
version
is
not
None
:
if
version
is
not
None
:
print
(
"
Using %s (%d.%d.%d)...
"
%
(
CLANG_FORMAT_CMD
,
version
[
0
],
version
[
1
],
version
[
2
]))
print
(
"
Using %s (%d.%d.%d)...
"
%
(
CLANG_FORMAT_CMD
,
version
[
0
],
version
[
1
],
version
[
2
]))
return
version
return
version
...
@@ -172,7 +172,7 @@ def main():
...
@@ -172,7 +172,7 @@ def main():
if
version
<
VERSION_MIN
:
if
version
<
VERSION_MIN
:
print
(
"
Version of clang-format is too old:
"
,
version
,
"
<
"
,
VERSION_MIN
)
print
(
"
Version of clang-format is too old:
"
,
version
,
"
<
"
,
VERSION_MIN
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
if
version
>
=
VERSION_MAX_RECOMMENDED
:
if
version
>
VERSION_MAX_RECOMMENDED
:
print
(
"
WARNING: Version of clang-format is too recent:
"
,
version
,
"
>=
"
,
VERSION_MIN
)
print
(
"
WARNING: Version of clang-format is too recent:
"
,
version
,
"
>=
"
,
VERSION_MIN
)
print
(
"
You may want to install clang-format-%d.%d, or use the precompiled libs repository.
"
%
(
version
[
0
],
version
[
1
]))
print
(
"
You may want to install clang-format-%d.%d, or use the precompiled libs repository.
"
%
(
version
[
0
],
version
[
1
]))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment