From 32a881e346baa7ba420ab2d17031bc05596c1169 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 27 Jul 2015 16:54:30 -0700 Subject: [PATCH] Remove DEPS-managed Dart packages We now use `pub` to manage Dart packages. --- .gitignore | 14 ----- DEPS | 53 ---------------- sky/build/skyx.gni | 7 +-- sky/packages/material_design_icons/BUILD.gn | 4 -- sky/sdk/BUILD.gn | 1 - third_party/dart-pkg/BUILD.gn | 69 --------------------- 6 files changed, 2 insertions(+), 146 deletions(-) diff --git a/.gitignore b/.gitignore index 913af49fe..1d452d6ef 100644 --- a/.gitignore +++ b/.gitignore @@ -38,20 +38,6 @@ Thumbs.db /third_party/brotli/src/ /third_party/colorama/src/ /third_party/dart-sdk/ -/third_party/dart-pkg/archive -/third_party/dart-pkg/args -/third_party/dart-pkg/box2d -/third_party/dart-pkg/cassowary -/third_party/dart-pkg/collection -/third_party/dart-pkg/crypto -/third_party/dart-pkg/newton -/third_party/dart-pkg/path -/third_party/dart-pkg/quiver -/third_party/dart-pkg/source_span -/third_party/dart-pkg/string_scanner -/third_party/dart-pkg/vector_math -/third_party/dart-pkg/vector_math -/third_party/dart-pkg/yaml /third_party/dejavu-fonts-ttf-2.34/ttf/*.ttf /third_party/freetype-android/src /third_party/go/tool/ diff --git a/DEPS b/DEPS index 88b03a0a9..3a8ab192c 100644 --- a/DEPS +++ b/DEPS @@ -24,20 +24,6 @@ vars = { 'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485', 'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b', - - 'archive_dart_revision': '07ffd98c5403b7f9ae067b57dc9487611be420f5', - 'args_dart_revision': 'e0e8377412ee6cd6a5a4a8632848181c1db91f44', - 'box2d_dart_revision': 'c5e65d9546275e78ad2a1d51b459e7638f6e4323', - 'cassowary_dart_revision': '7e5afc5b3956a18636d5b37b1dcba1705865564b', - 'collection_dart_revision': '79ebc6fc2dae581cb23ad50a5c600c1b7dd132f8', - 'crypto_dart_revision': 'd4558dea1639e5ad2a41d045265b8ece270c2d90', - 'newton_dart_revision': '11cd659e1650591402b69f91b9c4d2a0841fd5bd', - 'path_dart_revision': '2f3dcdec32011f1bc41194ae3640d6d9292a7096', - 'quiver_dart_revision': '6bab7dec34189eee579178eb16d3063c8ae69031', - 'source_span_dart_revision': '5c6c13f62fc111adaace3aeb4a38853d64481d06', - 'string_scanner_dart_revision': '9f00056b32f41efc376adecfb696a01bc7c593d7', - 'vector_math_dart_revision': '65915583f7aa606cb47ed265f853c18c60102b81', - 'yaml_dart_revision': 'd8c1ce75edf051ea1d5583b24474f8656abb4920', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -78,45 +64,6 @@ deps = { 'src/third_party/mesa/src': Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '071d25db04c23821a12a8b260ab9d96a097402f0', - - 'src/third_party/dart-pkg/archive': - Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + Var('archive_dart_revision'), - - 'src/third_party/dart-pkg/args': - Var('chromium_git') + '/external/github.com/dart-lang/args.git' + '@' + Var('args_dart_revision'), - - 'src/third_party/dart-pkg/box2d': - Var('chromium_git') + '/external/github.com/google/box2d.dart.git' + '@' + Var('box2d_dart_revision'), - - 'src/third_party/dart-pkg/cassowary': - Var('chromium_git') + '/external/github.com/domokit/cassowary.git' + '@' + Var('cassowary_dart_revision'), - - 'src/third_party/dart-pkg/collection': - Var('chromium_git') + '/external/github.com/dart-lang/collection.git' + '@' + Var('collection_dart_revision'), - - 'src/third_party/dart-pkg/crypto': - Var('chromium_git') + '/external/github.com/dart-lang/crypto.git' + '@' + Var('crypto_dart_revision'), - - 'src/third_party/dart-pkg/newton': - Var('chromium_git') + '/external/github.com/domokit/newton.git' + '@' + Var('newton_dart_revision'), - - 'src/third_party/dart-pkg/path': - Var('chromium_git') + '/external/github.com/dart-lang/path.git' + '@' + Var('path_dart_revision'), - - 'src/third_party/dart-pkg/quiver': - Var('chromium_git') + '/external/github.com/google/quiver-dart.git' + '@' + Var('quiver_dart_revision'), - - 'src/third_party/dart-pkg/source_span': - Var('chromium_git') + '/external/github.com/dart-lang/source_span.git' + '@' + Var('source_span_dart_revision'), - - 'src/third_party/dart-pkg/string_scanner': - Var('chromium_git') + '/external/github.com/dart-lang/string_scanner.git' + '@' + Var('string_scanner_dart_revision'), - - 'src/third_party/dart-pkg/vector_math': - Var('chromium_git') + '/external/github.com/google/vector_math.dart.git' + '@' + Var('vector_math_dart_revision'), - - 'src/third_party/dart-pkg/yaml': - Var('chromium_git') + '/external/github.com/dart-lang/yaml.git' + '@' + Var('yaml_dart_revision'), } deps_os = { diff --git a/sky/build/skyx.gni b/sky/build/skyx.gni index 0deaae77a..12d3b2ae0 100644 --- a/sky/build/skyx.gni +++ b/sky/build/skyx.gni @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -package_root = "$root_gen_dir/dart-pkg/packages" - template("skyx") { bundle_prefix = target_name bundle = "$target_gen_dir/${bundle_prefix}.skyx" @@ -35,7 +33,7 @@ template("skyx") { rebase_path("$sky_snapshot_dir/sky_snapshot", src_dir), rebase_path(main_dart, src_dir), "--package-root", - rebase_path(package_root, src_dir), + rebase_path("//sky/packages/workbench/packages", src_dir), "--snapshot", rebase_path(snapshot, src_dir), "-C", @@ -67,7 +65,7 @@ template("skyx") { script = "//sky/tools/skyx.py" args = [ "--package-root", - rebase_path(package_root, root_build_dir), + rebase_path("//sky/tools/skyx/packages", root_build_dir), "--asset-base", rebase_path(asset_base, root_build_dir), "--snapshot", @@ -86,7 +84,6 @@ template("skyx") { deps = [ ":gen_${bundle_prefix}_snapshot", - "//third_party/dart-pkg", ] } diff --git a/sky/packages/material_design_icons/BUILD.gn b/sky/packages/material_design_icons/BUILD.gn index 60bf59a2d..b71690a07 100644 --- a/sky/packages/material_design_icons/BUILD.gn +++ b/sky/packages/material_design_icons/BUILD.gn @@ -16,8 +16,4 @@ action("material_design_icons") { "--touch", rebase_path(stamp_file, root_build_dir) ] - - deps = [ - "//third_party/dart-pkg", - ] } diff --git a/sky/sdk/BUILD.gn b/sky/sdk/BUILD.gn index 7d127962e..6872eb0ac 100644 --- a/sky/sdk/BUILD.gn +++ b/sky/sdk/BUILD.gn @@ -23,7 +23,6 @@ action("sky") { "//mojo/public/dart:mojo", "//sky/packages/sky_engine", "//sky/packages/sky_services", - "//third_party/dart-pkg", ] } diff --git a/third_party/dart-pkg/BUILD.gn b/third_party/dart-pkg/BUILD.gn index 8f7c873b4..3dd4c0758 100644 --- a/third_party/dart-pkg/BUILD.gn +++ b/third_party/dart-pkg/BUILD.gn @@ -2,74 +2,5 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/dart/rules.gni") - group("dart-pkg") { - deps = [ - ":archive", - ":args", - ":box2d", - ":cassowary", - ":collection", - ":crypto", - ":newton", - ":path", - ":quiver", - ":source_span", - ":string_scanner", - ":vector_math", - ":yaml", - ] -} - -dart_pkg("archive") { - pkg_dir = "//third_party/dart-pkg/archive" -} - -dart_pkg("args") { - pkg_dir = "//third_party/dart-pkg/args" -} - -dart_pkg("box2d") { - pkg_dir = "//third_party/dart-pkg/box2d" -} - -dart_pkg("cassowary") { - pkg_dir = "//third_party/dart-pkg/cassowary" -} - -dart_pkg("collection") { - pkg_dir = "//third_party/dart-pkg/collection" -} - -dart_pkg("crypto") { - pkg_dir = "//third_party/dart-pkg/crypto" -} - -dart_pkg("newton") { - pkg_dir = "//third_party/dart-pkg/newton" -} - -dart_pkg("path") { - pkg_dir = "//third_party/dart-pkg/path" -} - -dart_pkg("quiver") { - pkg_dir = "//third_party/dart-pkg/quiver" -} - -dart_pkg("source_span") { - pkg_dir = "//third_party/dart-pkg/source_span" -} - -dart_pkg("string_scanner") { - pkg_dir = "//third_party/dart-pkg/string_scanner" -} - -dart_pkg("vector_math") { - pkg_dir = "//third_party/dart-pkg/vector_math" -} - -dart_pkg("yaml") { - pkg_dir = "//third_party/dart-pkg/yaml" }