Fix various pub issues.

lib/src/barback/dart2js_transformer.dart

 // Copyright (c) 2013, 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 pub.dart2js_transformer;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:analyzer/analyzer.dart';
 import 'package:barback/barback.dart';
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as p;
 import 'package:pool/pool.dart';
 
 import 'package:compiler_unsupported/compiler.dart' as compiler;
 import 'package:compiler_unsupported/src/dart2js.dart'
     show AbortLeg;
 import 'package:compiler_unsupported/src/io/source_file.dart';
 import '../barback.dart';
 import '../dart.dart' as dart;
 import '../utils.dart';
 import 'asset_environment.dart';
@@ skipping 171 matching lines @@
 }
 
 /// Defines an interface for dart2js to communicate with barback and pub.
 ///
 /// Note that most of the implementation of diagnostic handling here was
 /// copied from [FormattingDiagnosticHandler] in dart2js. The primary
 /// difference is that it uses barback's logging code and, more importantly, it
 /// handles missing source files more gracefully.
 class _BarbackCompilerProvider implements dart.CompilerProvider {
   Uri get libraryRoot =>
-      Uri.parse("${path.toUri(path.absolute(_libraryRootPath))}/");
+      Uri.parse("${p.toUri(p.normalize(p.absolute(_libraryRootPath)))}/");
 
   final AssetEnvironment _environment;
   final Transform _transform;
   String _libraryRootPath;
 
   /// The map of previously loaded files.
   ///
   /// Used to show where an error occurred in a source file.
   final _sourceFiles = new Map<String, SourceFile>();
 
@@ skipping 50 matching lines @@
     _libraryRootPath = _environment.rootPackage.path(
         buildDir, "packages", r"$sdk");
   }
 
   /// A [CompilerInputProvider] for dart2js.
   Future<String> provideInput(Uri resourceUri) {
     // We only expect to get absolute "file:" URLs from dart2js.
     assert(resourceUri.isAbsolute);
     assert(resourceUri.scheme == "file");
 
-    var sourcePath = path.fromUri(resourceUri);
+    var sourcePath = p.fromUri(resourceUri);
     return _readResource(resourceUri).then((source) {
       _sourceFiles[resourceUri.toString()] =
-          new StringSourceFile(resourceUri, path.relative(sourcePath), source);
+          new StringSourceFile(resourceUri, p.relative(sourcePath), source);
       return source;
     });
   }
 
   /// A [CompilerOutputProvider] for dart2js.
   EventSink<String> provideOutput(String name, String extension) {
     // TODO(rnystrom): Do this more cleanly. See: #17403.
     if (!generateSourceMaps && extension.endsWith(".map")) {
       return new NullSink<String>();
     }
 
     // TODO(nweiz): remove this special case when dart2js stops generating these
     // files.
     if (extension.endsWith(".precompiled.js")) return new NullSink<String>();
 
     var primaryId = _transform.primaryInput.id;
 
     // Dart2js uses an empty string for the name of the entrypoint library.
     // Otherwise, it's the name of a deferred library.
     var outPath;
     if (name == "") {
       outPath = _transform.primaryInput.id.path;
     } else {
-      var dirname = path.url.dirname(_transform.primaryInput.id.path);
-      outPath = path.url.join(dirname, name);
+      var dirname = p.url.dirname(_transform.primaryInput.id.path);
+      outPath = p.url.join(dirname, name);
     }
 
     var id = new AssetId(primaryId.package, "$outPath.$extension");
 
     // Make a sink that dart2js can write to.
     var sink = new StreamController<String>();
 
     // dart2js gives us strings, but stream assets expect byte lists.
     var stream = UTF8.encoder.bind(sink.stream);
 
@@ skipping 78 matching lines @@
   }
 
   AssetId _sourceUrlToId(Uri url) {
     // See if it's a package path.
     var id = packagesUrlToId(url);
     if (id != null) return id;
 
     // See if it's a path to a "public" asset within the root package. All
     // other files in the root package are not visible to transformers, so
     // should be loaded directly from disk.
-    var sourcePath = path.fromUri(url);
+    var sourcePath = p.fromUri(url);
     if (_environment.containsPath(sourcePath)) {
-      var relative = path.toUri(_environment.rootPackage.relative(sourcePath))
+      var relative = p.toUri(_environment.rootPackage.relative(sourcePath))
           .toString();
 
       return new AssetId(_environment.rootPackage.name, relative);
     }
 
     return null;
   }
 }
 
 /// An [EventSink] that discards all data. Provided to dart2js when we don't
 /// want an actual output.
 class NullSink<T> implements EventSink<T> {
   void add(T event) {}
   void addError(errorEvent, [StackTrace stackTrace]) {}
   void close() {}
 }