Index: sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart |
index 3c78647e47b276c9cbb939fe44d03161727f2156..837c555f92a2ed2ab3123301c8441cf4b38a83d9 100644 |
--- a/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart |
+++ b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart |
@@ -216,10 +216,10 @@ Future<String> compile(Path script, |
new FormattingDiagnosticHandler(provider).diagnosticHandler; |
} |
Uri scriptUri = cwd.resolve(script.toString()); |
- Uri libraryUri = cwd.resolve('${libraryRoot}/'); |
+ Uri libraryUri = cwd.resolve(appendSlash(libraryRoot.toString())); |
Johnni Winther
2013/03/07 14:51:57
This appends a slash only if needed.
|
Uri packageUri = null; |
if (packageRoot != null) { |
- packageUri = cwd.resolve('${packageRoot}/'); |
+ packageUri = cwd.resolve(appendSlash(packageRoot.toString())); |
} |
return api.compile(scriptUri, libraryUri, packageUri, |
provider.readStringFromUri, diagnosticHandler, options); |
@@ -240,10 +240,10 @@ Future<MirrorSystem> analyze(List<Path> libraries, |
diagnosticHandler = |
new FormattingDiagnosticHandler(provider).diagnosticHandler; |
} |
- Uri libraryUri = cwd.resolve('${libraryRoot}/'); |
+ Uri libraryUri = cwd.resolve(appendSlash(libraryRoot.toString())); |
Uri packageUri = null; |
if (packageRoot != null) { |
- packageUri = cwd.resolve('${packageRoot}/'); |
+ packageUri = cwd.resolve(appendSlash(packageRoot.toString())); |
} |
options = new List<String>.from(options); |
options.add('--analyze-only'); |