mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
switch to 4 space indent
Leave the recipes/ code at 2 space to match the rest of the recipes
project in other repos.
Reformatted using:
files=( $(
git ls-tree -r --name-only HEAD | \
grep -Ev -e '^(third_party|recipes)/' | \
grep '\.py$';
git grep -l '#!/usr/bin/env.*python' | grep -v '\.py$'
) )
parallel ./yapf -i -- "${files[@]}"
~/chromiumos/chromite/contrib/reflow_overlong_comments "${files[@]}"
The files that still had strings that were too long were manually
reformatted because they were easy and only a few issues.
autoninja.py
clang_format.py
download_from_google_storage.py
fix_encoding.py
gclient_utils.py
git_cache.py
git_common.py
git_map_branches.py
git_reparent_branch.py
gn.py
my_activity.py
owners_finder.py
presubmit_canned_checks.py
reclient_helper.py
reclientreport.py
roll_dep.py
rustfmt.py
siso.py
split_cl.py
subcommand.py
subprocess2.py
swift_format.py
upload_to_google_storage.py
These files still had lines (strings) that were too long, so the pylint
warnings were suppressed with a TODO.
auth.py
gclient.py
gclient_eval.py
gclient_paths.py
gclient_scm.py
gerrit_util.py
git_cl.py
presubmit_canned_checks.py
presubmit_support.py
scm.py
Change-Id: Ia6535c4f2c48d46b589ec1e791dde6c6b2ea858f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4836379
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
@@ -10,64 +10,64 @@ import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
DEPOT_TOOLS_DIR = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
|
||||
# This function is inspired from the one in src/tools/vim/ninja-build.vim in the
|
||||
# Chromium repository.
|
||||
def path_to_source_root(path):
|
||||
"""Returns the absolute path to the chromium source root."""
|
||||
candidate = os.path.dirname(path)
|
||||
# This is a list of directories that need to identify the src directory. The
|
||||
# shorter it is, the more likely it's wrong (checking for just
|
||||
# "build/common.gypi" would find "src/v8" for files below "src/v8", as
|
||||
# "src/v8/build/common.gypi" exists). The longer it is, the more likely it is
|
||||
# to break when we rename directories.
|
||||
fingerprints = ['chrome', 'net', 'v8', 'build', 'skia']
|
||||
while candidate and not all(
|
||||
os.path.isdir(os.path.join(candidate, fp)) for fp in fingerprints):
|
||||
new_candidate = os.path.dirname(candidate)
|
||||
if new_candidate == candidate:
|
||||
raise Exception("Couldn't find source-dir from %s" % path)
|
||||
candidate = os.path.dirname(candidate)
|
||||
return candidate
|
||||
"""Returns the absolute path to the chromium source root."""
|
||||
candidate = os.path.dirname(path)
|
||||
# This is a list of directories that need to identify the src directory. The
|
||||
# shorter it is, the more likely it's wrong (checking for just
|
||||
# "build/common.gypi" would find "src/v8" for files below "src/v8", as
|
||||
# "src/v8/build/common.gypi" exists). The longer it is, the more likely it
|
||||
# is to break when we rename directories.
|
||||
fingerprints = ['chrome', 'net', 'v8', 'build', 'skia']
|
||||
while candidate and not all(
|
||||
os.path.isdir(os.path.join(candidate, fp)) for fp in fingerprints):
|
||||
new_candidate = os.path.dirname(candidate)
|
||||
if new_candidate == candidate:
|
||||
raise Exception("Couldn't find source-dir from %s" % path)
|
||||
candidate = os.path.dirname(candidate)
|
||||
return candidate
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
'--file-path',
|
||||
help='The file path, could be absolute or relative to the current '
|
||||
'directory.',
|
||||
required=True)
|
||||
parser.add_argument(
|
||||
'--build-dir',
|
||||
help='The build directory, relative to the source directory.',
|
||||
required=True)
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
'--file-path',
|
||||
help='The file path, could be absolute or relative to the current '
|
||||
'directory.',
|
||||
required=True)
|
||||
parser.add_argument(
|
||||
'--build-dir',
|
||||
help='The build directory, relative to the source directory.',
|
||||
required=True)
|
||||
|
||||
options = parser.parse_args()
|
||||
options = parser.parse_args()
|
||||
|
||||
src_dir = path_to_source_root(os.path.abspath(options.file_path))
|
||||
abs_build_dir = os.path.join(src_dir, options.build_dir)
|
||||
src_relpath = os.path.relpath(options.file_path, abs_build_dir)
|
||||
src_dir = path_to_source_root(os.path.abspath(options.file_path))
|
||||
abs_build_dir = os.path.join(src_dir, options.build_dir)
|
||||
src_relpath = os.path.relpath(options.file_path, abs_build_dir)
|
||||
|
||||
print('Building %s' % options.file_path)
|
||||
print('Building %s' % options.file_path)
|
||||
|
||||
carets = '^'
|
||||
if sys.platform == 'win32':
|
||||
# The caret character has to be escaped on Windows as it's an escape
|
||||
# character.
|
||||
carets = '^^'
|
||||
carets = '^'
|
||||
if sys.platform == 'win32':
|
||||
# The caret character has to be escaped on Windows as it's an escape
|
||||
# character.
|
||||
carets = '^^'
|
||||
|
||||
command = [
|
||||
'python3',
|
||||
os.path.join(DEPOT_TOOLS_DIR, 'ninja.py'), '-C', abs_build_dir,
|
||||
'%s%s' % (src_relpath, carets)
|
||||
]
|
||||
# |shell| should be set to True on Windows otherwise the carets characters
|
||||
# get dropped from the command line.
|
||||
return subprocess.call(command, shell=sys.platform=='win32')
|
||||
command = [
|
||||
'python3',
|
||||
os.path.join(DEPOT_TOOLS_DIR, 'ninja.py'), '-C', abs_build_dir,
|
||||
'%s%s' % (src_relpath, carets)
|
||||
]
|
||||
# |shell| should be set to True on Windows otherwise the carets characters
|
||||
# get dropped from the command line.
|
||||
return subprocess.call(command, shell=sys.platform == 'win32')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
sys.exit(main())
|
||||
|
||||
Reference in New Issue
Block a user