diff options
| author | Bert Belder <bertbelder@gmail.com> | 2019-09-14 15:01:27 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2019-09-15 17:47:50 +0200 |
| commit | e7d1da367150b03456b9e0f04b6ecd2ec13d51e0 (patch) | |
| tree | 2adba5a09b599b417aba77776921416c304bb564 /tools/format.py | |
| parent | d936c49d532eaf6c4a5b8981765066cbc0b5a829 (diff) | |
tools: clean up third_party.py, and merge prebuilt.py into it (#2950)
* Remove reference to removed dir 'third_party/rust_crates'.
* Remove reference to unused environment variable 'DENO_NINJA_PATH'.
* Remove helper functions 'root()' and 'tp()'.
* Move definition of 'third_party_path' to build.py.
* Move definition of 'gn_exe()' to setup.py.
* Move 'download_sccache()' and 'download_hyperfine()' from prebuilt.py
to third_party.py, and delete prebuilt.py.
* Add helper function 'get_platform_dir_name()' to locate the
platform-specific 'v8/buildtools/<platform>' and
'prebuilt/<platform>' directories.
* Add helper function 'get_prebuilt_tool_path()' that returns the full
path to a platform-specific executable in //prebuilt.
* Cosmetic improvements.
Diffstat (limited to 'tools/format.py')
| -rwxr-xr-x | tools/format.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/format.py b/tools/format.py index 95aa2d2e9..5c9fcfcef 100755 --- a/tools/format.py +++ b/tools/format.py @@ -5,8 +5,7 @@ import os import sys import argparse from third_party import google_env, python_env -from third_party import clang_format_path, third_party_path -from util import root_path, run, find_exts, platform +from util import root_path, run, find_exts, platform, third_party_path parser = argparse.ArgumentParser() parser.add_argument("--js", help="only run prettier", action="store_true") @@ -15,6 +14,8 @@ parser.add_argument("--py", help="only run yapf", action="store_true") parser.add_argument("--gn", help="only run gn format", action="store_true") parser.add_argument("--cc", help="only run clang format", action="store_true") +clang_format_path = os.path.join(third_party_path, "depot_tools", + "clang-format") prettier_path = os.path.join(third_party_path, "node_modules", "prettier", "bin-prettier.js") tools_path = os.path.join(root_path, "tools") |