Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: lib/src/package_locations.dart

Issue 1277773002: Support resources in "pub run" and "pub global run". (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/global_packages.dart ('k') | test/global/run/resource_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/package_locations.dart
diff --git a/lib/src/package_locations.dart b/lib/src/package_locations.dart
index 69ef87cd1b3fedc92abfbe009b1aa63343b27def..78ebb1865c8d263dca997ba80385cfa556af92ba 100644
--- a/lib/src/package_locations.dart
+++ b/lib/src/package_locations.dart
@@ -6,25 +6,23 @@
// TODO(lrn): Also move packages/ directory management to this library.
library pub.package_locations;
-import 'dart:async';
-
import 'package:package_config/packages_file.dart' as packages_file;
import 'package:path/path.dart' as p;
import 'package_graph.dart';
import 'io.dart';
-import 'log.dart' as log;
import 'utils.dart' show ordered;
/// Creates a `.packages` file with the locations of the packages in [graph].
///
-/// The file is written in the root directory of the entrypoint of [graph].
+/// The file is written to [path], which defaults to the root directory of the
+/// entrypoint of [graph].
///
/// If the file already exists, it is deleted before the new content is written.
-void writePackagesMap(PackageGraph graph) {
- var packagesFilePath = graph.entrypoint.root.path(".packages");
+void writePackagesMap(PackageGraph graph, [String path]) {
+ path ??= graph.entrypoint.root.path(".packages");
var content = _createPackagesMap(graph);
- writeTextFile(packagesFilePath, content);
+ writeTextFile(path, content);
}
/// Template for header text put into `.packages` file.
@@ -46,7 +44,14 @@ String _createPackagesMap(PackageGraph packageGraph) {
var packages = packageGraph.packages;
var uriMap = {};
for (var packageName in ordered(packages.keys)) {
- var location = packages[packageName].path("lib");
+ var package = packages[packageName];
+
+ // This indicates an in-memory package, which is presumably a fake
+ // entrypoint we created for something like "pub global activate". We don't
+ // need to import from it anyway, so we can just not add it to the map.
+ if (package.dir == null) continue;
+
+ var location = package.path("lib");
uriMap[packageName] = p.toUri(location);
}
« no previous file with comments | « lib/src/global_packages.dart ('k') | test/global/run/resource_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698