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:
@@ -2,7 +2,6 @@
|
||||
# Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
"""Outputs host CPU architecture in format recognized by gyp."""
|
||||
|
||||
from __future__ import print_function
|
||||
@@ -10,55 +9,59 @@ from __future__ import print_function
|
||||
import platform
|
||||
import re
|
||||
|
||||
|
||||
def HostArch():
|
||||
"""Returns the host architecture with a predictable string."""
|
||||
host_arch = platform.machine().lower()
|
||||
host_processor = platform.processor().lower()
|
||||
"""Returns the host architecture with a predictable string."""
|
||||
host_arch = platform.machine().lower()
|
||||
host_processor = platform.processor().lower()
|
||||
|
||||
# Convert machine type to format recognized by gyp.
|
||||
if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
|
||||
host_arch = 'x86'
|
||||
elif host_arch in ['x86_64', 'amd64']:
|
||||
host_arch = 'x64'
|
||||
elif host_arch == 'arm64' or host_arch.startswith('aarch64'):
|
||||
host_arch = 'arm64'
|
||||
elif host_arch.startswith('arm'):
|
||||
host_arch = 'arm'
|
||||
elif host_arch.startswith('mips64'):
|
||||
host_arch = 'mips64'
|
||||
elif host_arch.startswith('mips'):
|
||||
host_arch = 'mips'
|
||||
elif host_arch.startswith('ppc') or host_processor == 'powerpc':
|
||||
host_arch = 'ppc'
|
||||
elif host_arch.startswith('s390'):
|
||||
host_arch = 's390'
|
||||
elif host_arch.startswith('riscv'):
|
||||
host_arch = 'riscv64'
|
||||
# Convert machine type to format recognized by gyp.
|
||||
if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
|
||||
host_arch = 'x86'
|
||||
elif host_arch in ['x86_64', 'amd64']:
|
||||
host_arch = 'x64'
|
||||
elif host_arch == 'arm64' or host_arch.startswith('aarch64'):
|
||||
host_arch = 'arm64'
|
||||
elif host_arch.startswith('arm'):
|
||||
host_arch = 'arm'
|
||||
elif host_arch.startswith('mips64'):
|
||||
host_arch = 'mips64'
|
||||
elif host_arch.startswith('mips'):
|
||||
host_arch = 'mips'
|
||||
elif host_arch.startswith('ppc') or host_processor == 'powerpc':
|
||||
host_arch = 'ppc'
|
||||
elif host_arch.startswith('s390'):
|
||||
host_arch = 's390'
|
||||
elif host_arch.startswith('riscv'):
|
||||
host_arch = 'riscv64'
|
||||
|
||||
if host_arch == 'arm64':
|
||||
host_platform = platform.architecture()
|
||||
if len(host_platform) > 1:
|
||||
if host_platform[1].lower() == 'windowspe':
|
||||
# Special case for Windows on Arm: windows-386 packages no longer work
|
||||
# so use the x64 emulation (this restricts us to Windows 11). Python
|
||||
# 32-bit returns the host_arch as arm64, 64-bit does not.
|
||||
return 'x64'
|
||||
if host_arch == 'arm64':
|
||||
host_platform = platform.architecture()
|
||||
if len(host_platform) > 1:
|
||||
if host_platform[1].lower() == 'windowspe':
|
||||
# Special case for Windows on Arm: windows-386 packages no
|
||||
# longer work so use the x64 emulation (this restricts us to
|
||||
# Windows 11). Python 32-bit returns the host_arch as arm64,
|
||||
# 64-bit does not.
|
||||
return 'x64'
|
||||
|
||||
# platform.machine is based on running kernel. It's possible to use 64-bit
|
||||
# kernel with 32-bit userland, e.g. to give linker slightly more memory.
|
||||
# Distinguish between different userland bitness by querying
|
||||
# the python binary.
|
||||
if host_arch == 'x64' and platform.architecture()[0] == '32bit':
|
||||
host_arch = 'x86'
|
||||
if host_arch == 'arm64' and platform.architecture()[0] == '32bit':
|
||||
host_arch = 'arm'
|
||||
# platform.machine is based on running kernel. It's possible to use 64-bit
|
||||
# kernel with 32-bit userland, e.g. to give linker slightly more memory.
|
||||
# Distinguish between different userland bitness by querying
|
||||
# the python binary.
|
||||
if host_arch == 'x64' and platform.architecture()[0] == '32bit':
|
||||
host_arch = 'x86'
|
||||
if host_arch == 'arm64' and platform.architecture()[0] == '32bit':
|
||||
host_arch = 'arm'
|
||||
|
||||
return host_arch
|
||||
|
||||
return host_arch
|
||||
|
||||
def DoMain(_):
|
||||
"""Hook to be called from gyp without starting a separate python
|
||||
"""Hook to be called from gyp without starting a separate python
|
||||
interpreter."""
|
||||
return HostArch()
|
||||
return HostArch()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(DoMain([]))
|
||||
print(DoMain([]))
|
||||
|
||||
Reference in New Issue
Block a user