Skip to content

Commit

Permalink
Update all DEPS to match chromium's DEPS at edb488e
Browse files Browse the repository at this point in the history
Also remove the now disfunctinal 'builddeps' and 'dependencies' targets

BUG=none
[email protected],[email protected]
LOG=y

Review URL: https://codereview.chromium.org/788613002

Cr-Commit-Position: refs/heads/master@{#25710}
  • Loading branch information
jeisinger authored and Commit bot committed Dec 8, 2014
1 parent abe5c29 commit 779076e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 37 deletions.
19 changes: 9 additions & 10 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,30 @@ vars = {
}

deps = {
# Remember to keep the revision in sync with the Makefile.
"v8/build/gyp":
Var("git_url") + "/external/gyp.git@a3e2a5caf24a1e0a45401e09ad131210bf16b852",
Var("git_url") + "/external/gyp.git" + "@" + "fe00999dfaee449d3465a9316778434884da4fa7", # from svn revision 2010
"v8/third_party/icu":
Var("git_url") + "/chromium/deps/icu52.git@26d8859357ac0bfb86b939bf21c087b8eae22494",
Var("git_url") + "/chromium/deps/icu52.git" + "@" + "866ff696e9022a6000afbab516fba62cfa306075", # from svn revision 293126
"v8/buildtools":
Var("git_url") + "/chromium/buildtools.git@fb782d4369d5ae04f17a2fceef7de5a63e50f07b",
Var("git_url") + "/chromium/buildtools.git" + "@" + "ded32942a1ebfddff0ba1231898fc4f6c7faacec",
"v8/testing/gtest":
Var("git_url") + "/external/googletest.git@4650552ff637bb44ecf7784060091cbed3252211",
Var("git_url") + "/external/googletest.git" + "@" + "8245545b6dc9c4703e6496d1efd19e975ad2b038", # from svn revision 700
"v8/testing/gmock":
Var("git_url") + "/external/googlemock.git@896ba0e03f520fb9b6ed582bde2bd00847e3c3f2",
Var("git_url") + "/external/googlemock.git" + "@" + "29763965ab52f24565299976b936d1265cb6a271", # from svn revision 501
"v8/tools/clang":
Var("git_url") + "/chromium/src/tools/clang.git@72cba933544c8283c173083fbc5f162d00198081",
Var("git_url") + "/chromium/src/tools/clang.git" + "@" + "72cba933544c8283c173083fbc5f162d00198081",
}

deps_os = {
"android": {
"v8/third_party/android_tools":
Var("git_url") + "/android_tools.git@31869996507de16812bb53a3d0aaa15cd6194c16",
Var("git_url") + "/android_tools.git" + "@" + "4f723e2a5fa5b7b8a198072ac19b92344be2b271",
},
"win": {
"v8/third_party/cygwin":
Var("git_url") + "/chromium/deps/cygwin.git@06a117a90c15174436bfa20ceebbfdf43b7eb820",
Var("git_url") + "/chromium/deps/cygwin.git" + "@" + "c89e446b273697fadf3a10ff1007a97c0b7de6df",
"v8/third_party/python_26":
Var("git_url") + "/chromium/deps/python_26.git@67d19f904470effe3122d27101cc5a8195abd157",
Var("git_url") + "/chromium/deps/python_26.git" + "@" + "67d19f904470effe3122d27101cc5a8195abd157",
}
}

Expand Down
27 changes: 2 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ ifeq ($(arm_test_noprobe), on)
endif

# ----------------- available targets: --------------------
# - "builddeps": pulls in external dependencies for building
# - "dependencies": pulls in all external dependencies
# - "grokdump": rebuilds heap constants lists used by grokdump
# - any arch listed in ARCHES (see below)
# - any mode listed in MODES
Expand Down Expand Up @@ -486,26 +484,5 @@ GPATH GRTAGS GSYMS GTAGS: gtags.files $(shell cat gtags.files 2> /dev/null)
gtags.clean:
rm -f gtags.files GPATH GRTAGS GSYMS GTAGS

# Dependencies. "builddeps" are dependencies required solely for building,
# "dependencies" includes also dependencies required for development.
# Remember to keep these in sync with the DEPS file.
builddeps:
svn checkout --force https://gyp.googlecode.com/svn/trunk build/gyp \
--revision 1831
if svn info third_party/icu 2>&1 | grep -q icu46 ; then \
svn switch --force \
https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \
third_party/icu --revision 277999 ; \
else \
svn checkout --force \
https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \
third_party/icu --revision 277999 ; \
fi
svn checkout --force https://googletest.googlecode.com/svn/trunk \
testing/gtest --revision 692
svn checkout --force https://googlemock.googlecode.com/svn/trunk \
testing/gmock --revision 485

dependencies: builddeps
# The spec is a copy of the hooks in v8's DEPS file.
gclient sync -r fb782d4369d5ae04f17a2fceef7de5a63e50f07b --spec="solutions = [{u'managed': False, u'name': u'buildtools', u'url': u'https://chromium.googlesource.com/chromium/buildtools.git', u'custom_deps': {}, u'custom_hooks': [{u'name': u'clang_format_win',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platform=win32',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools/win/clang-format.exe.sha1']},{u'name': u'clang_format_mac',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platform=darwin',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools/mac/clang-format.sha1']},{u'name': u'clang_format_linux',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platform=linux*',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools/linux64/clang-format.sha1']}],u'deps_file': u'.DEPS.git', u'safesync_url': u''}]"
dependencies builddeps:
$(error Use 'gclient sync' instead)
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@ V8 Project page: https://code.google.com/p/v8/
Getting the Code
=============

V8 Git repository: https://chromium.googlesource.com/v8/v8.git
GitHub mirror: https://github.com/v8/v8-git-mirror
Checkout [depot tools](http://www.chromium.org/developers/how-tos/install-depot-tools), and run

> `fetch v8`
This will checkout V8 into the directory `v8` and fetch all of its dependencies.
To stay up to date, run

> `git pull origin`
> `gclient sync`
For fetching all branches, add the following into your remote
configuration in `.git/config`:
Expand Down

0 comments on commit 779076e

Please sign in to comment.