diff options
| author |   Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 21:44:29 +0200 |
|---|---|---|
| committer |   Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | 78431dc6941e3acc67c858277dfe4a0ed583643c (patch) | |
| tree | a0b0d052c0e2ec7b7f203b78bbb272ec9d72c3d8 /tools/clang_format.py | |
| parent | VOLK: update submodule pointer to 2.0.0 (diff) | |
| download | gnuradio-78431dc6941e3acc67c858277dfe4a0ed583643c.tar.xz gnuradio-78431dc6941e3acc67c858277dfe4a0ed583643c.zip | |
clang-format: required clang-format version 7.0.1, no includes sorting
Diffstat (limited to 'tools/clang_format.py')
| -rwxr-xr-x | tools/clang_format.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/clang_format.py b/tools/clang_format.py index 693630e6d..888e76efc 100755 --- a/tools/clang_format.py +++ b/tools/clang_format.py @@ -50,8 +50,8 @@ if __name__ == "__main__" and __package__ is None: # # Expected version of clang-format -CLANG_FORMAT_VERSION = "4.0.1" -CLANG_FORMAT_SHORT_VERSION = "4.0" +CLANG_FORMAT_VERSION = "7.0.1" +CLANG_FORMAT_SHORT_VERSION = "7.0" # Name of clang-format as a binary CLANG_FORMAT_PROGNAME = "clang-format" @@ -186,7 +186,7 @@ class ClangFormat(object): # Update the file with clang-format formatted = not subprocess.call( - [self.path, "--style=file", "-i", file_name]) + [self.path, "--style=file", "-i", file_name , "-sort-includes=false"]) # Version 3.8 generates files like foo.cpp~RF83372177.TMP when it formats foo.cpp # on Windows, we must clean these up |