diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gclient_config.py | 39 | ||||
| -rwxr-xr-x | tools/lint.py | 2 | ||||
| -rw-r--r-- | tools/package.json | 14 | ||||
| -rw-r--r-- | tools/third_party.py | 12 |
4 files changed, 63 insertions, 4 deletions
diff --git a/tools/gclient_config.py b/tools/gclient_config.py new file mode 100644 index 000000000..f7ca728e7 --- /dev/null +++ b/tools/gclient_config.py @@ -0,0 +1,39 @@ +# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. +# pylint: disable=line-too-long +solutions = [ + { + 'url': 'https://chromium.googlesource.com/v8/v8.git@7.9.317.12', + 'name': 'v8', + 'deps_file': 'DEPS', + 'custom_deps': { + 'v8/build': None, + 'v8/third_party/catapult': None, + 'v8/third_party/colorama/src': None, + 'v8/testing/gmock': None, + 'v8/tools/swarming_client': None, + 'v8/tools/gyp': None, + 'v8/third_party/instrumented_libraries': None, + 'v8/third_party/android_tools': None, + 'v8/third_party/depot_tools': None, + 'v8/test/wasm-js': None, + 'v8/test/benchmarks/data': None, + 'v8/test/mozilla/data': None, + 'v8/third_party/icu': None, + 'v8/test/test262/data': None, + 'v8/test/test262/harness': None, + 'v8/tools/luci-go': None + } + }, + { + 'url': + 'https://chromium.googlesource.com/chromium/tools/depot_tools@efce0d1b7657c440c90f0f4bce614b96672b9e0b', + 'name': + 'depot_tools' + }, + { + 'url': + 'https://github.com/cpplint/cpplint.git@a33992f68f36fcaa6d0f531a25012a4c474d3542', + 'name': + 'cpplint' + } +] diff --git a/tools/lint.py b/tools/lint.py index ad6498541..beb1a180c 100755 --- a/tools/lint.py +++ b/tools/lint.py @@ -55,7 +55,7 @@ def pylint(): print "pylint" script = os.path.join(third_party_path, "python_packages", "pylint") rcfile = os.path.join(third_party_path, "depot_tools", "pylintrc") - source_files = git_ls_files(root_path, ["*.py", ":!:gclient_config.py"]) + source_files = git_ls_files(root_path, ["*.py"]) run([sys.executable, script, "--rcfile=" + rcfile, "--"] + source_files, env=python_env(), shell=False, diff --git a/tools/package.json b/tools/package.json new file mode 100644 index 000000000..56e056b6a --- /dev/null +++ b/tools/package.json @@ -0,0 +1,14 @@ +{ + "name": "deno", + "private": true, + "devDependencies": { + "@types/prettier": "1.16.1", + "@typescript-eslint/eslint-plugin": "2.5.0", + "@typescript-eslint/parser": "2.5.0", + "eslint": "5.15.1", + "eslint-config-prettier": "4.1.0", + "magic-string": "0.25.2", + "prettier": "1.17.1", + "typescript": "3.6.3" + } +} diff --git a/tools/third_party.py b/tools/third_party.py index 238cb67d7..0ba9dd37d 100644 --- a/tools/third_party.py +++ b/tools/third_party.py @@ -78,7 +78,13 @@ def google_env(env=None, merge_env=None, depot_tools_path_=depot_tools_path): # Run Yarn to install JavaScript dependencies. def run_yarn(): - run(["yarn", "install"], cwd=third_party_path) + node_modules_path = os.path.join(third_party_path, "node_modules") + # Note to keep the root directory clean, we keep package.json is in tools/. + run([ + "yarn", "install", "--no-lockfile", + "--modules-folder=" + node_modules_path + ], + cwd=os.path.join(root_path, "tools")) # Install python packages with pip. @@ -119,7 +125,7 @@ def run_pip(): rmtree(temp_python_home) -# Run gclient to install other dependencies. +# Run gclient to install V8. def run_gclient_sync(): # Depot_tools will normally try to self-update, which will fail because # it's not checked out from it's own git repository; gclient will then try @@ -151,7 +157,7 @@ def run_gclient_sync(): ] envs = { "DEPOT_TOOLS_UPDATE": "0", - "GCLIENT_FILE": os.path.join(root_path, "gclient_config.py") + "GCLIENT_FILE": os.path.join(root_path, "tools", "gclient_config.py") } env = google_env(depot_tools_path_=depot_tools_temp_path, merge_env=envs) run(args, cwd=third_party_path, env=env) |