diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-02 05:53:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-02 05:53:37 +0000 |
| commit | b4addc88108093a1fb6ea728fac3185182b8bf9e (patch) | |
| tree | 570e5fd0bb1004acaff6ec6a34d118813e899824 /DEPS | |
| parent | 98ddf44d2c27771683a41e53f4cf33b44ec34d45 (diff) | |
| download | chromium_src-b4addc88108093a1fb6ea728fac3185182b8bf9e.zip chromium_src-b4addc88108093a1fb6ea728fac3185182b8bf9e.tar.gz chromium_src-b4addc88108093a1fb6ea728fac3185182b8bf9e.tar.bz2 | |
Pull third_party/clang_format/scripts via DEPS.
Apparently replacing an existing directory with something from DEPS
doesn't work, so this is done in 3 in stages:
1.) add deps entry that pulls stuff to third_party/clang_format/script (note no trailing s)
2.) update depot_tools (again) to point to "script" instead of "scripts".
3.) delete old dir
This is stage 1. It'll only be super confusing for a few short days.
BUG=240309,333093
Review URL: https://codereview.chromium.org/133823005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -17,6 +17,7 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", + "llvm_url": "http://src.chromium.org/llvm-project", "llvm_git": "https://llvm.googlesource.com", "libcxx_revision": "8f48c23568a122de6088455700e9d197b79bd8f8", "libcxxabi_revision": "753a30dd68ae008948d48f16bc942d5963fe65a1", @@ -119,9 +120,11 @@ deps = { "src/third_party/leveldatabase/src": (Var("googlecode_url") % "leveldb") + "/trunk@78", + # TODO(thakis): Pull from svn instead, http://crbug.com/333071 "src/third_party/libc++/trunk": Var("llvm_git") + "/libcxx.git@" + Var("libcxx_revision"), + # TODO(thakis): Pull from svn instead, http://crbug.com/333071 "src/third_party/libc++abi/trunk": Var("llvm_git") + "/libcxxabi.git@" + Var("libcxxabi_revision"), @@ -272,6 +275,9 @@ deps = { "src/tools/deps2git": "/trunk/tools/deps2git@248305", + "src/third_party/clang_format/script": + Var("llvm_url") + "/cfe/trunk/tools/clang-format@198831", + "src/third_party/webpagereplay": (Var("googlecode_url") % "web-page-replay") + "/trunk@537", |