InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change clang_format.py to search for clang-format in buildtools

Browse Source 
BUG=none
R=brettw@chromium.org,nick@chromium.org

Review URL: https://codereview.chromium.org/356733002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@280971 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jochen@chromium.org
2014-07-02 07:35:31 +00:00
parent 76ce73c726
commit aaee92f1ec
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
clang_format.py
View File

@@ -23,22 +23,14 @@ class NotFoundError(Exception):
' %s' % e)
def _FindChromiumSourceRoot():
"""Return the source root of the current chromium checkout, or die trying."""
# The use of .gn is somewhat incongruous here, but we need a file uniquely
# existing at src/. GN does the same thing at least.
source_root = gclient_utils.FindFileUpwards('.gn')
if not source_root:
raise NotFoundError(
'.gn file not found in any parent of the current path.')
return source_root
def FindClangFormatToolInChromiumTree():
"""Return a path to the clang-format executable, or die trying."""
tool_path = os.path.join(_FindChromiumSourceRoot(), 'third_party',
'clang_format', 'bin',
gclient_utils.GetMacWinOrLinux(),
bin_path = gclient_utils.GetBuildtoolsPlatformBinaryPath()
if not bin_path:
raise NotFoundError(
'Could not find checkout in any parent of the current path.')
tool_path = os.path.join(bin_path,
'clang-format' + gclient_utils.GetExeSuffix())
if not os.path.exists(tool_path):
raise NotFoundError('File does not exist: %s' % tool_path)
@@ -47,8 +39,11 @@ def FindClangFormatToolInChromiumTree():
def FindClangFormatScriptInChromiumTree(script_name):
"""Return a path to a clang-format helper script, or die trying."""
script_path = os.path.join(_FindChromiumSourceRoot(), 'third_party',
'clang_format', 'script', script_name)
tools_path = gclient_utils.GetBuildtoolsPath()
if not tools_path:
raise NotFoundError(
'Could not find checkout in any parent of the current path.')
script_path = os.path.join(tools_path, 'clang_format', 'script', script_name)
if not os.path.exists(script_path):
raise NotFoundError('File does not exist: %s' % script_path)
return script_path