Skip to content

V
V8
Commit 6096f1bb authored by jochen@chromium.org's avatar jochen@chromium.org
Browse files
Options

Roll buildtools to fb782d4369d5ae04f17a2fceef7de5a63e50f07b 

Also add hooks to download clang-format binaries.

BUG=none
R=machenbach@chromium.org
LOG=n

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22036 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4273c7c0
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 9 deletions
.DEPS.git
View file @ 6096f1bb
......@@ -14,7 +14,7 @@ deps = {
'v8/build/gyp':
Var('git_url') + '/external/gyp.git@a3e2a5caf24a1e0a45401e09ad131210bf16b852',
'v8/buildtools':
Var('git_url') + '/chromium/buildtools.git@5d89977ce55240995d1596fe420b818468f5ec37',
Var('git_url') + '/chromium/buildtools.git@fb782d4369d5ae04f17a2fceef7de5a63e50f07b',
'v8/third_party/icu':
Var('git_url') + '/chromium/deps/icu46.git@7a1ec88f69e25b3efcf76196d07f7815255db025',
}
......@@ -30,14 +30,67 @@ deps_os = {
}
include_rules = [
'+include',
'+unicode'
]
skip_child_includes = [
'build',
'third_party'
]
hooks = [
{
'action':
[
'download_from_google_storage',
'--no_resume',
'--platform=win32',
'--no_auth',
'--bucket',
'chromium-clang-format',
'-s',
'v8/buildtools/win/clang-format.exe.sha1'
],
'pattern':
'.',
'name':
'clang_format_win'
},
{
'action':
[
'download_from_google_storage',
'--no_resume',
'--platform=darwin',
'--no_auth',
'--bucket',
'chromium-clang-format',
'-s',
'v8/buildtools/mac/clang-format.sha1'
],
'pattern':
'.',
'name':
'clang_format_mac'
},
{
'action':
[
'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket',
'chromium-clang-format',
'-s',
'v8/buildtools/linux64/clang-format.sha1'
],
'pattern':
'.',
'name':
'clang_format_linux'
},
{
'action':
[
......
.gitignore
View file @ 6096f1bb
......@@ -23,6 +23,7 @@
.cpplint-cache
.cproject
.d8_history
.gclient_entries
.project
.pydevproject
.settings
......
DEPS
View file @ 6096f1bb
......@@ -5,7 +5,7 @@
vars = {
"chromium_trunk": "https://src.chromium.org/svn/trunk",
"buildtools_revision": "5d89977ce55240995d1596fe420b818468f5ec37",
"buildtools_revision": "fb782d4369d5ae04f17a2fceef7de5a63e50f07b",
}
deps = {
......@@ -44,6 +44,40 @@ skip_child_includes = [
]
hooks = [
# Pull clang-format binaries using checked-in hashes.
{
"name": "clang_format_win",
"pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=win32",
"--no_auth",
"--bucket", "chromium-clang-format",
"-s", "v8/buildtools/win/clang-format.exe.sha1",
],
},
{
"name": "clang_format_mac",
"pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=darwin",
"--no_auth",
"--bucket", "chromium-clang-format",
"-s", "v8/buildtools/mac/clang-format.sha1",
],
},
{
"name": "clang_format_linux",
"pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
"--no_auth",
"--bucket", "chromium-clang-format",
"-s", "v8/buildtools/linux64/clang-format.sha1",
],
},
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
......
Makefile
View file @ 6096f1bb
......@@ -469,8 +469,5 @@ dependencies:
svn checkout --force \
https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \
third_party/icu --revision 258359
( test -d buildtools || \
git clone https://chromium.googlesource.com/chromium/buildtools.git; \
cd buildtools; \
git fetch origin; \
git checkout 5d89977ce55240995d1596fe420b818468f5ec37 )
# 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''}]"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment