Fix server mode

TBR=jmesserly@google.com Review URL: https://codereview.chromium.org/1235293004.
dart-lang · Jul 18, 2015 · 9fe41d1 · 9fe41d1
1 parent 60aba74
commit 9fe41d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/dev_compiler/lib/src/codegen/html_codegen.dart b/pkg/dev_compiler/lib/src/codegen/html_codegen.dart
@@ -80,12 +80,15 @@ String generateEntryHtml(HtmlSourceNode root, AbstractCompiler compiler) {
   }
 
   String mainLibraryName;
+  var src = scripts[0].attributes["src"];
+  var scriptUri = root.source.resolveRelativeUri(Uri.parse(src));
+
   for (var lib in libraries) {
     var info = lib.info;
     if (info == null) continue;
     var uri = info.library.source.uri;
     var jsPath = compiler.getModulePath(uri);
-    if (info.isEntry) mainLibraryName = compiler.getModuleName(uri);
+    if (uri == scriptUri) mainLibraryName = compiler.getModuleName(uri);
     if (lib.cachingHash != null) {
       jsPath = _addHash(jsPath, lib.cachingHash);
     }

diff --git a/pkg/dev_compiler/lib/src/server/server.dart b/pkg/dev_compiler/lib/src/server/server.dart
@@ -57,11 +57,12 @@ class ServerCompiler extends AbstractCompiler {
     var graph = new SourceGraph(context, reporter, options);
     var entryNode = graph.nodeFromUri(inputUri);
 
-    return new ServerCompiler._(options, context, reporter, entryNode);
+    return new ServerCompiler._(context, options, reporter, entryNode);
   }
 
-  ServerCompiler._(context, options, reporter, this._entryNode)
-      : super(options, context, reporter) {
+  ServerCompiler._(AnalysisContext context, CompilerOptions options,
+      AnalysisErrorListener reporter, this._entryNode)
+      : super(context, options, reporter) {
     if (outputDir != null) {
       _generators.add(new JSGenerator(this));
     }