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/setup.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/setup.py')
-rwxr-xr-x | tools/setup.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/tools/setup.py b/tools/setup.py index 47281ff8b..b8b9da324 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -5,10 +5,9 @@ import re import sys from distutils.spawn import find_executable import argparse -import prebuilt import third_party -from util import (build_mode, build_path, enable_ansi_colors, root_path, run, - shell_quote) +from util import build_mode, build_path, enable_ansi_colors, run, shell_quote +from util import root_path, third_party_path parser = argparse.ArgumentParser() parser.add_argument( @@ -30,8 +29,8 @@ def main(): third_party.download_gn() third_party.download_clang_format() third_party.download_clang() + third_party.download_sccache() third_party.maybe_download_sysroot() - prebuilt.load_sccache() write_lastchange() @@ -126,7 +125,7 @@ def generate_gn_args(mode): if "DENO_BUILD_ARGS" in os.environ: out += os.environ["DENO_BUILD_ARGS"].split() - cacher = os.path.join(root_path, prebuilt.get_platform_path("sccache")) + cacher = third_party.get_prebuilt_tool_path("sccache") if not os.path.exists(cacher): cacher = find_executable("sccache") or find_executable("ccache") @@ -143,6 +142,13 @@ def generate_gn_args(mode): return out +def gn_exe(): + if "DENO_GN_PATH" in os.environ: + return os.environ["DENO_GN_PATH"] + else: + return os.path.join(third_party_path, "depot_tools", "gn") + + # gn gen. def gn_gen(mode): os.environ["DENO_BUILD_MODE"] = mode @@ -169,8 +175,7 @@ def gn_gen(mode): for line in gn_args: print " " + line - run([third_party.gn_path, "gen", build_path()], - env=third_party.google_env()) + run([gn_exe(), "gen", build_path()], env=third_party.google_env()) if __name__ == '__main__': |