- Implement Platform.packageRoot and Platform.packageConfig based

runtime/bin/builtin.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library builtin;
 // NOTE: Do not import 'dart:io' in builtin.
 import 'dart:async';
 import 'dart:collection';
 import 'dart:_internal';
 import 'dart:isolate';
@@ skipping 210 matching lines @@
   if (!_setupCompleted) {
     _setupHooks();
   }
   if (_traceLoading) {
     _log('Setting package root: $packageRoot');
   }
   packageRoot = _enforceTrailingSlash(packageRoot);
   if (packageRoot.startsWith('file:') ||
       packageRoot.startsWith('http:') ||
       packageRoot.startsWith('https:')) {
     _packageRoot = _workingDirectory.resolve(packageRoot);

[Lasse Reichstein Nielsen, 2015/12/17 07:03:33]

If packageRoot starts with a scheme, then _workingDirectory.resolve(packageRoot)
should be the same as Uri.parse(packageRot), so just use the later.

[Ivan Posva, 2015/12/17 15:44:35]

Thanks for your suggestion, but I don't think they are entirely equivalent if
you have a URI with a relative path here.

[Lasse Reichstein Nielsen, 2015/12/17 16:34:29]

If packageRoot starts with file:, http: or https:, then it is not relative. In
that case it doesn't matter what _workingDirectory is.

   } else {
     packageRoot = _sanitizeWindowsPath(packageRoot);
     packageRoot = _trimWindowsPath(packageRoot);
     _packageRoot = _workingDirectory.resolveUri(new Uri.file(packageRoot));

[Lasse Reichstein Nielsen, 2015/12/17 07:03:33]

Maybe use "new Uri.directory" instead. It ensures that the path ends in a slash
as a directory should (since it already ends in a slash, it shouldn't do
anything, so it's just a safety precaution).

[Ivan Posva, 2015/12/17 15:44:35]

The slash has already been added with _enforceTrailingSlash above and we would
need that anyway for the path with a scheme, so I am keeping this as is.

   }
+  // Now that we have determined the packageRoot value being used, set it
+  // up for use in Platform.packageRoot.
+  VMLibraryHooks.packageRoot = _packageRoot.toString();
   if (_traceLoading) {
     _log('Package root URI: $_packageRoot');
   }
 }
 
 
 // Given a uri with a 'package' scheme, return a Uri that is prefixed with
 // the package root.
 Uri _resolvePackageUri(Uri uri) {
   if (!uri.host.isEmpty) {
@@ skipping 228 matching lines @@
   if (_workingDirectory == null) {
     throw 'No current working directory set.';
   }
   var packagesName = _sanitizeWindowsPath(packagesParam);
   var packagesUri = Uri.parse(packagesName);
   if (packagesUri.scheme == '') {
     // Script does not have a scheme, assume that it is a path,
     // resolve it against the working directory.
     packagesUri = _workingDirectory.resolveUri(packagesUri);
   }
+  VMLibraryHooks.packageConfig = packagesUri.toString();
   if (_traceLoading) {
     _log('Resolved packages map to: $packagesUri');
   }
 
   // Request the loading and parsing of the packages map at the specified URI.
   // Create a port to receive the packages map on.
   assert(_packagesPort == null);
   _packagesPort = new RawReceivePort(_handlePackagesReply);
   var sp = _packagesPort.sendPort;
 
@@ skipping 333 matching lines @@
 }
 
 
 // Register callbacks and hooks with the rest of the core libraries.
 _setupHooks() {
   _setupCompleted = true;
   VMLibraryHooks.resourceReadAsBytes = _resourceReadAsBytes;
   VMLibraryHooks.getPackageRoot = _getPackageRoot;
   VMLibraryHooks.getPackageMap = _getPackageMap;
 }