diff --git a/tools/deps/dartium.deps/DEPS b/tools/deps/dartium.deps/DEPS index d81a2c4ac436..17b660ec1293 100644 --- a/tools/deps/dartium.deps/DEPS +++ b/tools/deps/dartium.deps/DEPS @@ -5,6 +5,72 @@ # an exact copy of the modified DEPS.chromium in this directory. vars = { + # Start of Dartium vars + + "dartium_chromium_commit": "67146b50bbc0dab33006c51b5dde056ee16f0f2b", + "chromium_base_revision": "378081", + + # We use mirrors of all github repos to guarantee reproducibility and + # consistency between what users see and what the bots see. + # We need the mirrors to not have 100+ bots pulling github constantly. + # We mirror our github repos on chromium git servers. + # DO NOT use this var if you don't see a mirror here: + # https://chromium.googlesource.com/ + # named like: + # external/github.com/dart-lang/NAME + # It is ok to add a dependency directly on dart-lang (dart-lang only) + # github repo until the mirror has been created, but please do file a bug + # against infra to make that happen. + "github_mirror": + "https://chromium.googlesource.com/external/github.com/dart-lang/%s.git", + + "args_tag": "@0.13.0", + "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", + "charcode_tag": "@1.1.0", + "collection_tag": "@1.9.1", + "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", + "csslib_tag" : "@0.12.0", + "dart2js_info_tag" : "@0.5.4+2", + "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", + "html_tag" : "@0.12.1+1", + "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", + "http_multi_server_tag" : "@1.3.2", + "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", + "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", + "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", + "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", + "matcher_tag": "@0.12.0", + "mime_rev": "@75890811d4af5af080351ba8a2853ad4c8df98dd", + "metatest_rev": "@e5aa8e4e19fc4188ac2f6d38368a47d8f07c3df1", + "oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5", + "observatory_pub_packages_rev": "@26aad88f1c1915d39bbcbff3cad589e2402fdcf1", + "package_config_rev": "@0.1.3", + "package_resolver_tag": "@1.0.2+1", + "path_rev": "@b657c0854d1cf41c014986fa9d2321f1173df805", + "plugin_tag": "@0.1.0", + "pool_rev": "@22e12aeb16ad0b626900dbe79e4a25391ddfb28c", + "pub_rev": "@d7649be15213c43669a40c33af516d8eb210e876", + "pub_semver_tag": "@1.2.0", + "quiver_tag": "@0.21.4", + "root_certificates_rev": "@aed07942ce98507d2be28cbd29e879525410c7fc", + "shelf_rev": "@1e87b79b21ac5e6fa2f93576d6c06eaa65285ef4", + "shelf_web_socket_rev": "@ff170cec2c0e4e5722cdf47c557be63b5035a602", + "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", + "stack_trace_tag": "@1.2.1", + "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", + "test_tag": "@0.12.1", + "unittest_tag": "@0.11.6", + "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", + "watcher_tag": "@0.9.5", + "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", + "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", + "web_components_rev": "@6349e09f9118dce7ae1b309af5763745e25a9d61", + "WebCore_rev": "@3c45690813c112373757bbef53de1602a62af609", + + "co19_rev": "@4af9ef149be554216c5bb16cbac8e50d4c28cdf1", + + # End of Dartium vars + 'angle_revision': '4d76061e2be5b8b005afba8e0c145592c3b04527', 'boringssl_revision': @@ -187,7 +253,113 @@ deps = { 'src/tools/swarming_client': (Var("chromium_git")) + '/external/swarming.client.git@a72f46e42dba1335e8001499b4621acad2d26728', 'src/v8': - (Var("chromium_git")) + '/v8/v8.git@45a71919836046560ba8eb349eaf9172857ffe6f' + (Var("chromium_git")) + '/v8/v8.git@45a71919836046560ba8eb349eaf9172857ffe6f', + + # Start of Dartium specific deps + + "src": + Var("chromium_git") + "/dart/dartium/src.git" + "@" + + Var("dartium_chromium_commit"), + "src/dart/third_party/pkg/args": + (Var("github_mirror") % "args") + Var("args_tag"), + "src/dart/third_party/pkg/barback": + (Var("github_mirror") % "barback") + Var("barback_rev"), + "src/dart/third_party/pkg/charcode": + (Var("github_mirror") % "charcode") + Var("charcode_tag"), + "src/dart/third_party/pkg/crypto": + (Var("github_mirror") % "crypto") + Var("crypto_rev"), + "src/dart/third_party/pkg/csslib": + (Var("github_mirror") % "csslib") + Var("csslib_tag"), + "src/dart/third_party/pkg/dart2js_info": + (Var("github_mirror") % "dart2js_info") + Var("dart2js_info_tag"), + "src/dart/third_party/pkg/collection": + (Var("github_mirror") % "collection") + Var("collection_tag"), + "src/dart/third_party/pkg/glob": + (Var("github_mirror") % "glob") + Var("glob_rev"), + "src/dart/third_party/pkg/html": + (Var("github_mirror") % "html") + Var("html_tag"), + "src/dart/third_party/pkg/json_rpc_2": + (Var("github_mirror") % "json_rpc_2") + Var("json_rpc_2_rev"), + "src/dart/third_party/pkg/http": + (Var("github_mirror") % "http") + Var("http_rev"), + "src/dart/third_party/pkg/http_multi_server": + (Var("github_mirror") % "http_multi_server") + + Var("http_multi_server_tag"), + "src/dart/third_party/pkg/http_parser": + (Var("github_mirror") % "http_parser") + Var("http_parser_rev"), + "src/dart/third_party/pkg/http_throttle": + (Var("github_mirror") % "http_throttle") + Var("http_throttle_rev"), + "src/dart/third_party/pkg/logging": + (Var("github_mirror") % "logging") + Var("logging_rev"), + "src/dart/third_party/pkg/matcher": + (Var("github_mirror") % "matcher") + Var("matcher_tag"), + "src/dart/third_party/pkg/metatest": + (Var("github_mirror") % "metatest") + Var("metatest_rev"), + "src/dart/third_party/pkg/mime": + (Var("github_mirror") % "mime") + Var("mime_rev"), + "src/dart/third_party/pkg/oauth2": + (Var("github_mirror") % "oauth2") + Var("oauth2_rev"), + "src/dart/third_party/observatory_pub_packages": + (Var("github_mirror") % "observatory_pub_packages") + + Var("observatory_pub_packages_rev"), + "src/dart/third_party/pkg_tested/package_config": + (Var("github_mirror") % "package_config") + Var("package_config_rev"), + "src/dart/third_party/pkg_tested/package_resolver": + "https://github.com/dart-lang/package_resolver.git" + + Var("package_resolver_tag"), + "src/dart/third_party/pkg/path": + (Var("github_mirror") % "path") + Var("path_rev"), + "src/dart/third_party/pkg/plugin": + (Var("github_mirror") % "plugin") + Var("plugin_tag"), + "src/dart/third_party/pkg/pool": + (Var("github_mirror") % "pool") + Var("pool_rev"), + "src/dart/third_party/pkg/pub": + (Var("github_mirror") % "pub") + Var("pub_rev"), + "src/dart/third_party/pkg/pub_semver": + (Var("github_mirror") % "pub_semver") + Var("pub_semver_tag"), + "src/dart/third_party/pkg/quiver": + Var("chromium_git") + + "/external/github.com/google/quiver-dart.git" + + Var("quiver_tag"), + "src/dart/third_party/root_certificates": + (Var("github_mirror") % "root_certificates") + + Var("root_certificates_rev"), + "src/dart/third_party/pkg/shelf": + (Var("github_mirror") % "shelf") + Var("shelf_rev"), + "src/dart/third_party/pkg/shelf_web_socket": + (Var("github_mirror") % "shelf_web_socket") + Var("shelf_web_socket_rev"), + "src/dart/third_party/pkg/source_span": + (Var("github_mirror") % "source_span") + Var("source_span_rev"), + "src/dart/third_party/pkg/stack_trace": + (Var("github_mirror") % "stack_trace") + Var("stack_trace_tag"), + "src/dart/third_party/pkg/string_scanner": + (Var("github_mirror") % "string_scanner") + Var("string_scanner_rev"), + "src/dart/third_party/pkg/test": + (Var("github_mirror") % "test") + Var("test_tag"), + "src/dart/third_party/pkg/utf": + (Var("github_mirror") % "utf") + Var("utf_rev"), + "src/dart/third_party/pkg/watcher": + (Var("github_mirror") % "watcher") + Var("watcher_tag"), + "src/dart/third_party/pkg/web_components": + (Var("github_mirror") % "web-components") + Var("web_components_rev"), + "src/dart/third_party/pkg/yaml": + (Var("github_mirror") % "yaml") + Var("yaml_rev"), + + # TODO(sigmund): should be src/dart/third_party/pkg/unittest (dartbug.com/21949) + "src/dart/pkg/unittest": + (Var("github_mirror") % "test") + Var("unittest_tag"), + + "src/dart/third_party/WebCore": + "https://github.com/dart-lang/webcore.git" + Var("WebCore_rev"), + + "src/dart/tests/co19/src": + (Var("github_mirror") % "co19") + Var("co19_rev"), + + "src/dart/third_party/zlib": + Var("chromium_git") + "/chromium/src/third_party/zlib.git" + + Var("zlib_rev"), + + # End of Dartium deps } deps_os = { 'android': { @@ -263,8 +435,10 @@ deps_os = { 'mac': { 'src/chrome/installer/mac/third_party/xz/xz': (Var("chromium_git")) + '/chromium/deps/xz.git@eecaf55632ca72e90eb2641376bce7cdbc7284f7', - 'src/chrome/tools/test/reference_build/chrome_mac': - (Var("chromium_git")) + '/chromium/reference_builds/chrome_mac.git@8dc181329e7c5255f83b4b85dc2f71498a237955', + + # Dartium deps_os + 'src/chrome/tools/test/reference_build/chrome_mac': None, + 'src/third_party/google_toolbox_for_mac/src': (Var("chromium_git")) + '/external/github.com/google/google-toolbox-for-mac.git@401878398253074c515c03cb3a3f8bb0cc8da6e9', 'src/third_party/lighttpd': @@ -275,8 +449,9 @@ deps_os = { (Var("chromium_git")) + '/external/pdfsqueeze.git@5936b871e6a087b7e50d4cbcb122378d8a07499f' }, 'unix': { - 'src/chrome/tools/test/reference_build/chrome_linux': - (Var("chromium_git")) + '/chromium/reference_builds/chrome_linux64.git@033d053a528e820e1de3e2db766678d862a86b36', + # Dartium deps_os + 'src/chrome/tools/test/reference_build/chrome_linux': None, + 'src/third_party/chromite': (Var("chromium_git")) + '/chromiumos/chromite.git@e19f83ba227bf1ec0077f5d3a816a415f1dd88d0', 'src/third_party/cros_system_api': @@ -307,8 +482,9 @@ deps_os = { (Var("chromium_git")) + '/chromium/deps/xdg-utils.git@d80274d5869b17b8c9067a1022e4416ee7ed5e0d' }, 'win': { - 'src/chrome/tools/test/reference_build/chrome_win': - (Var("chromium_git")) + '/chromium/reference_builds/chrome_win.git@f8a3a845dfc845df6b14280f04f86a61959357ef', + # Dartium deps_os + 'src/chrome/tools/test/reference_build/chrome_win': None, + 'src/third_party/bison': (Var("chromium_git")) + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3', 'src/third_party/cygwin': @@ -339,12 +515,10 @@ deps_os = { } hooks = [ { - 'action': [ - 'python', - 'src/build/landmines.py' - ], - 'pattern': - '.', + # Dartium hooks start + 'action': ['python', 'src/dart/tools/dartium/generate_dart_vm_version.py'], + 'pattern': 'dart', + # Dartium hooks end 'name': 'landmines' }, @@ -717,7 +891,43 @@ hooks = [ '.', 'name': 'gyp' + }, + + # Dartium hooks start + { + "name": "checked_in_dart_sdks", + "pattern": ".", + "action": [ + "download_from_google_storage", + "--no_auth", + "--no_resume", + "--bucket", + "dart-dependencies", + "--recursive", + "--auto_platform", + "--extract", + "--directory", + "src/dart/tools/sdks", + ], + }, + { + "name": "unittest", + # Unittest is an early version, 0.11.6, of the package "test" + # Do not use it in any new tests. + "pattern": ".", + "action": [ + "download_from_google_storage", + "--no_auth", + "--no_resume", + "--bucket", + "dart-dependencies", + "--extract", + "-s", + "src/dart/third_party/pkg/unittest.tar.gz.sha1", + ], } + + # Dartium hooks end ] include_rules = [ '+base', @@ -741,221 +951,3 @@ skip_child_includes = [ ] # END OF IMPORTED CHROMIUM DEPS - -# Now we need to override some settings and add some new ones. - -vars.update({ - "dartium_chromium_commit": "a0717ebdcf4578b98de1d858005aa9c5f346bd33", - "chromium_base_revision": "378081", - - # We use mirrors of all github repos to guarantee reproducibility and - # consistency between what users see and what the bots see. - # We need the mirrors to not have 100+ bots pulling github constantly. - # We mirror our github repos on chromium git servers. - # DO NOT use this var if you don't see a mirror here: - # https://chromium.googlesource.com/ - # named like: - # external/github.com/dart-lang/NAME - # It is ok to add a dependency directly on dart-lang (dart-lang only) - # github repo until the mirror has been created, but please do file a bug - # against infra to make that happen. - "github_mirror": - "https://chromium.googlesource.com/external/github.com/dart-lang/%s.git", - - "args_tag": "@0.13.0", - "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51", - "charcode_tag": "@1.1.0", - "collection_tag": "@1.9.1", - "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d", - "csslib_tag" : "@0.12.0", - "dart2js_info_tag" : "@0.5.4+2", - "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd", - "html_tag" : "@0.12.1+1", - "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7", - "http_multi_server_tag" : "@1.3.2", - "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4", - "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235", - "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c", - "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597", - "matcher_tag": "@0.12.0", - "mime_rev": "@75890811d4af5af080351ba8a2853ad4c8df98dd", - "metatest_rev": "@e5aa8e4e19fc4188ac2f6d38368a47d8f07c3df1", - "oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5", - "observatory_pub_packages_rev": "@26aad88f1c1915d39bbcbff3cad589e2402fdcf1", - "package_config_rev": "@0.1.3", - "package_resolver_tag": "@1.0.2+1", - "path_rev": "@b657c0854d1cf41c014986fa9d2321f1173df805", - "plugin_tag": "@0.1.0", - "pool_rev": "@22e12aeb16ad0b626900dbe79e4a25391ddfb28c", - "pub_rev": "@d7649be15213c43669a40c33af516d8eb210e876", - "pub_semver_tag": "@1.2.0", - "quiver_tag": "@0.21.4", - "root_certificates_rev": "@aed07942ce98507d2be28cbd29e879525410c7fc", - "shelf_rev": "@1e87b79b21ac5e6fa2f93576d6c06eaa65285ef4", - "shelf_web_socket_rev": "@ff170cec2c0e4e5722cdf47c557be63b5035a602", - "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05", - "stack_trace_tag": "@1.2.1", - "string_scanner_rev": "@3e7617d6f74ba382e9b6130b1cc12091d89a9bc5", - "test_tag": "@0.12.1", - "unittest_tag": "@0.11.6", - "utf_rev": "@1f55027068759e2d52f2c12de6a57cce5f3c5ee6", - "watcher_tag": "@0.9.5", - "yaml_rev": "@563a5ffd4a800a2897b8f4dd6b19f2a370df2f2b", - "zlib_rev": "@c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f", - "web_components_rev": "@6349e09f9118dce7ae1b309af5763745e25a9d61", - "WebCore_rev": "@3c45690813c112373757bbef53de1602a62af609", - - "co19_rev": "@4af9ef149be554216c5bb16cbac8e50d4c28cdf1", -}) - -deps.update({ - "src": - Var("chromium_git") + "/dart/dartium/src.git" + "@" + - Var("dartium_chromium_commit"), - "src/dart/third_party/pkg/args": - (Var("github_mirror") % "args") + Var("args_tag"), - "src/dart/third_party/pkg/barback": - (Var("github_mirror") % "barback") + Var("barback_rev"), - "src/dart/third_party/pkg/charcode": - (Var("github_mirror") % "charcode") + Var("charcode_tag"), - "src/dart/third_party/pkg/crypto": - (Var("github_mirror") % "crypto") + Var("crypto_rev"), - "src/dart/third_party/pkg/csslib": - (Var("github_mirror") % "csslib") + Var("csslib_tag"), - "src/dart/third_party/pkg/dart2js_info": - (Var("github_mirror") % "dart2js_info") + Var("dart2js_info_tag"), - "src/dart/third_party/pkg/collection": - (Var("github_mirror") % "collection") + Var("collection_tag"), - "src/dart/third_party/pkg/glob": - (Var("github_mirror") % "glob") + Var("glob_rev"), - "src/dart/third_party/pkg/html": - (Var("github_mirror") % "html") + Var("html_tag"), - "src/dart/third_party/pkg/json_rpc_2": - (Var("github_mirror") % "json_rpc_2") + Var("json_rpc_2_rev"), - "src/dart/third_party/pkg/http": - (Var("github_mirror") % "http") + Var("http_rev"), - "src/dart/third_party/pkg/http_multi_server": - (Var("github_mirror") % "http_multi_server") + - Var("http_multi_server_tag"), - "src/dart/third_party/pkg/http_parser": - (Var("github_mirror") % "http_parser") + Var("http_parser_rev"), - "src/dart/third_party/pkg/http_throttle": - (Var("github_mirror") % "http_throttle") + Var("http_throttle_rev"), - "src/dart/third_party/pkg/logging": - (Var("github_mirror") % "logging") + Var("logging_rev"), - "src/dart/third_party/pkg/matcher": - (Var("github_mirror") % "matcher") + Var("matcher_tag"), - "src/dart/third_party/pkg/metatest": - (Var("github_mirror") % "metatest") + Var("metatest_rev"), - "src/dart/third_party/pkg/mime": - (Var("github_mirror") % "mime") + Var("mime_rev"), - "src/dart/third_party/pkg/oauth2": - (Var("github_mirror") % "oauth2") + Var("oauth2_rev"), - "src/dart/third_party/observatory_pub_packages": - (Var("github_mirror") % "observatory_pub_packages") + - Var("observatory_pub_packages_rev"), - "src/dart/third_party/pkg_tested/package_config": - (Var("github_mirror") % "package_config") + Var("package_config_rev"), - "src/dart/third_party/pkg_tested/package_resolver": - "https://github.com/dart-lang/package_resolver.git" + - Var("package_resolver_tag"), - "src/dart/third_party/pkg/path": - (Var("github_mirror") % "path") + Var("path_rev"), - "src/dart/third_party/pkg/plugin": - (Var("github_mirror") % "plugin") + Var("plugin_tag"), - "src/dart/third_party/pkg/pool": - (Var("github_mirror") % "pool") + Var("pool_rev"), - "src/dart/third_party/pkg/pub": - (Var("github_mirror") % "pub") + Var("pub_rev"), - "src/dart/third_party/pkg/pub_semver": - (Var("github_mirror") % "pub_semver") + Var("pub_semver_tag"), - "src/dart/third_party/pkg/quiver": - Var("chromium_git") - + "/external/github.com/google/quiver-dart.git" - + Var("quiver_tag"), - "src/dart/third_party/root_certificates": - (Var("github_mirror") % "root_certificates") - + Var("root_certificates_rev"), - "src/dart/third_party/pkg/shelf": - (Var("github_mirror") % "shelf") + Var("shelf_rev"), - "src/dart/third_party/pkg/shelf_web_socket": - (Var("github_mirror") % "shelf_web_socket") + Var("shelf_web_socket_rev"), - "src/dart/third_party/pkg/source_span": - (Var("github_mirror") % "source_span") + Var("source_span_rev"), - "src/dart/third_party/pkg/stack_trace": - (Var("github_mirror") % "stack_trace") + Var("stack_trace_tag"), - "src/dart/third_party/pkg/string_scanner": - (Var("github_mirror") % "string_scanner") + Var("string_scanner_rev"), - "src/dart/third_party/pkg/test": - (Var("github_mirror") % "test") + Var("test_tag"), - "src/dart/third_party/pkg/utf": - (Var("github_mirror") % "utf") + Var("utf_rev"), - "src/dart/third_party/pkg/watcher": - (Var("github_mirror") % "watcher") + Var("watcher_tag"), - "src/dart/third_party/pkg/web_components": - (Var("github_mirror") % "web-components") + Var("web_components_rev"), - "src/dart/third_party/pkg/yaml": - (Var("github_mirror") % "yaml") + Var("yaml_rev"), - - # TODO(sigmund): should be src/dart/third_party/pkg/unittest (dartbug.com/21949) - "src/dart/pkg/unittest": - (Var("github_mirror") % "test") + Var("unittest_tag"), - - "src/dart/third_party/WebCore": - "https://github.com/dart-lang/webcore.git" + Var("WebCore_rev"), - - "src/dart/tests/co19/src": - (Var("github_mirror") % "co19") + Var("co19_rev"), - - "src/dart/third_party/zlib": - Var("chromium_git") + "/chromium/src/third_party/zlib.git" + - Var("zlib_rev"), -}) - -deps_os['win'].update({ - "src/chrome/tools/test/reference_build/chrome_win": None -}) -deps_os['mac'].update({ - "src/chrome/tools/test/reference_build/chrome_mac": None -}) -deps_os['unix'].update({ - "src/chrome/tools/test/reference_build/chrome_linux": None -}) - -hooks[0:0] = [{ - "pattern": "dart", - "action": ["python", "src/dart/tools/dartium/generate_dart_vm_version.py"], - }] - -hooks.append({ - "name": "checked_in_dart_sdks", - "pattern": ".", - "action": [ - "download_from_google_storage", - "--no_auth", - "--no_resume", - "--bucket", - "dart-dependencies", - "--recursive", - "--auto_platform", - "--extract", - "--directory", - "src/dart/tools/sdks", - ], -}) -hooks.append({ - "name": "unittest", - # Unittest is an early version, 0.11.6, of the package "test" - # Do not use it in any new tests. - "pattern": ".", - "action": [ - "download_from_google_storage", - "--no_auth", - "--no_resume", - "--bucket", - "dart-dependencies", - "--extract", - "-s", - "src/dart/third_party/pkg/unittest.tar.gz.sha1", - ], -})