mirror of
https://github.com/dart-lang/sdk
synced 2024-10-04 19:29:35 +00:00
Match version of idl_parser and WebCore so go.sh can be run from a Dart only enlistment.
Needed to pull in the tools/idl_parser code for a Dart enlistment populated during a gclient sync. Added .gitingore to not ignore tools/idl_parse TBR=jacobr@google.com,alanknight@google.com Review URL: https://codereview.chromium.org/1768853002 .
This commit is contained in:
parent
ec906bf12b
commit
a552c24089
6
DEPS
6
DEPS
|
@ -48,7 +48,7 @@ vars = {
|
||||||
"http_multi_server_tag" : "@2.0.0",
|
"http_multi_server_tag" : "@2.0.0",
|
||||||
"http_parser_tag" : "@1.1.0",
|
"http_parser_tag" : "@1.1.0",
|
||||||
"http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235",
|
"http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235",
|
||||||
"idl_parser_rev": "@6316d5982dc24b34d09dd8b10fbeaaff28d83a48",
|
"idl_parser_rev": "@7fbe68cab90c38147dee4f48c30ad0d496c17915",
|
||||||
"intl_rev": "@a8b480b9c436f6c0ec16730804c914bdb4e30d53",
|
"intl_rev": "@a8b480b9c436f6c0ec16730804c914bdb4e30d53",
|
||||||
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
|
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
|
||||||
"json_rpc_2_tag": "@1.1.1",
|
"json_rpc_2_tag": "@1.1.1",
|
||||||
|
@ -92,7 +92,7 @@ vars = {
|
||||||
"when_tag": "@0.2.0+2",
|
"when_tag": "@0.2.0+2",
|
||||||
"which_tag": "@0.1.3+1",
|
"which_tag": "@0.1.3+1",
|
||||||
"web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec",
|
"web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec",
|
||||||
"WebCore_rev": "@5ecb723fd9ffcc0d108f5e0e24d12b8b3df7b200",
|
"WebCore_rev": "@a86fe28efadcfc781f836037a80f27e22a5dad17",
|
||||||
"yaml_tag": "@2.1.5",
|
"yaml_tag": "@2.1.5",
|
||||||
"zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f",
|
"zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f",
|
||||||
"barback-0.13.0_rev": "@34853",
|
"barback-0.13.0_rev": "@34853",
|
||||||
|
@ -129,7 +129,7 @@ deps = {
|
||||||
Var("chromium_git") + "/chromium/src/third_party/ply.git" +
|
Var("chromium_git") + "/chromium/src/third_party/ply.git" +
|
||||||
Var("ply_rev"),
|
Var("ply_rev"),
|
||||||
|
|
||||||
Var("dart_root") + "/third_party/idl_parser":
|
Var("dart_root") + "/tools/idl_parser":
|
||||||
Var("chromium_git") + "/chromium/src/tools/idl_parser.git" +
|
Var("chromium_git") + "/chromium/src/tools/idl_parser.git" +
|
||||||
Var("idl_parser_rev"),
|
Var("idl_parser_rev"),
|
||||||
|
|
||||||
|
|
3
tools/.gitignore
vendored
Normal file
3
tools/.gitignore
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
# tools/idl_parser is populated by gclient sync
|
||||||
|
idl_parser
|
||||||
|
|
|
@ -29,6 +29,14 @@ if not os.path.exists(ply_dir):
|
||||||
# location is dartium-git/src/third_party
|
# location is dartium-git/src/third_party
|
||||||
third_party_dir = os.path.join(dart_dir, '..', 'third_party')
|
third_party_dir = os.path.join(dart_dir, '..', 'third_party')
|
||||||
assert(os.path.exists(third_party_dir))
|
assert(os.path.exists(third_party_dir))
|
||||||
|
else:
|
||||||
|
# It's Dart we need to make sure that tools in injected in our search path
|
||||||
|
# because this is where idl_parser is located for a Dart enlistment. Dartium
|
||||||
|
# can firgure out the tools directory because of the location of where the
|
||||||
|
# scripts blink scripts are located.
|
||||||
|
tools_dir = os.path.join(dart_dir, 'tools')
|
||||||
|
sys.path.insert(1, tools_dir)
|
||||||
|
|
||||||
sys.path.insert(1, third_party_dir)
|
sys.path.insert(1, third_party_dir)
|
||||||
|
|
||||||
sys.path.insert(1, os.path.join(dart_dir, 'tools/dom/scripts'))
|
sys.path.insert(1, os.path.join(dart_dir, 'tools/dom/scripts'))
|
||||||
|
|
Loading…
Reference in a new issue