Skip to content

Commit a552c24

Browse files
committed
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 [email protected],[email protected] Review URL: https://codereview.chromium.org/1768853002 .
1 parent ec906bf commit a552c24

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ vars = {
4848
"http_multi_server_tag" : "@2.0.0",
4949
"http_parser_tag" : "@1.1.0",
5050
"http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235",
51-
"idl_parser_rev": "@6316d5982dc24b34d09dd8b10fbeaaff28d83a48",
51+
"idl_parser_rev": "@7fbe68cab90c38147dee4f48c30ad0d496c17915",
5252
"intl_rev": "@a8b480b9c436f6c0ec16730804c914bdb4e30d53",
5353
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
5454
"json_rpc_2_tag": "@1.1.1",
@@ -92,7 +92,7 @@ vars = {
9292
"when_tag": "@0.2.0+2",
9393
"which_tag": "@0.1.3+1",
9494
"web_components_rev": "@0e636b534d9b12c9e96f841e6679398e91a986ec",
95-
"WebCore_rev": "@5ecb723fd9ffcc0d108f5e0e24d12b8b3df7b200",
95+
"WebCore_rev": "@a86fe28efadcfc781f836037a80f27e22a5dad17",
9696
"yaml_tag": "@2.1.5",
9797
"zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f",
9898
"barback-0.13.0_rev": "@34853",
@@ -129,7 +129,7 @@ deps = {
129129
Var("chromium_git") + "/chromium/src/third_party/ply.git" +
130130
Var("ply_rev"),
131131

132-
Var("dart_root") + "/third_party/idl_parser":
132+
Var("dart_root") + "/tools/idl_parser":
133133
Var("chromium_git") + "/chromium/src/tools/idl_parser.git" +
134134
Var("idl_parser_rev"),
135135

tools/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# tools/idl_parser is populated by gclient sync
2+
idl_parser
3+

tools/dom/scripts/dartdomgenerator.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
# location is dartium-git/src/third_party
3030
third_party_dir = os.path.join(dart_dir, '..', 'third_party')
3131
assert(os.path.exists(third_party_dir))
32+
else:
33+
# It's Dart we need to make sure that tools in injected in our search path
34+
# because this is where idl_parser is located for a Dart enlistment. Dartium
35+
# can firgure out the tools directory because of the location of where the
36+
# scripts blink scripts are located.
37+
tools_dir = os.path.join(dart_dir, 'tools')
38+
sys.path.insert(1, tools_dir)
39+
3240
sys.path.insert(1, third_party_dir)
3341

3442
sys.path.insert(1, os.path.join(dart_dir, 'tools/dom/scripts'))

0 commit comments

Comments
 (0)