Support multiple resolution inputs from command line.

pkg/compiler/lib/src/dart2js.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 dart2js.cmdline;
 
 import 'dart:async' show EventSink, Future;
 import 'dart:convert' show UTF8, LineSplitter;
 import 'dart:io' show exit, File, FileMode, Platform, stdin, stderr;
 
@@ skipping 90 matching lines @@
   }
 }
 
 FormattingDiagnosticHandler diagnosticHandler;
 
 Future<api.CompilationResult> compile(List<String> argv) {
   stackTraceFilePrefix = '$currentDirectory';
   Uri libraryRoot = currentDirectory;
   Uri out = currentDirectory.resolve('out.js');
   Uri sourceMapOut = currentDirectory.resolve('out.js.map');
-  Uri resolutionInput;
+  List<Uri> resolutionInputs;
   Uri packageConfig = null;
   Uri packageRoot = null;
   List<String> options = new List<String>();
   List<String> explicitOutputArguments = <String>[];
   bool wantHelp = false;
   bool wantVersion = false;
   String outputLanguage = 'JavaScript';
   bool stripArgumentSet = false;
   bool analyzeOnly = false;
   bool analyzeAll = false;
@@ skipping 61 matching lines @@
           null,
           null,
           "--output-type=dart is deprecated. It will remain available "
           "in Dart 1.11, but will be removed in Dart 1.12.",
           api.Diagnostic.WARNING);
     }
     passThrough(argument);
   }
 
   void setResolutionInput(String argument) {
-    resolutionInput =
-        currentDirectory.resolve(extractPath(argument, isDirectory: false));
+    resolutionInputs = <Uri>[];
+    String parts = extractParameter(argument);
+    for (String part in parts.split(',')) {
+      resolutionInputs.add(
+          currentDirectory.resolve(nativeToUriPath(part)));
+    }
   }
 
   void setResolveOnly(String argument) {
     resolveOnly = true;
     passThrough(argument);
   }
 
   String getDepsOutput(Map<Uri, SourceFile> sourceFiles) {
     var filenames = sourceFiles.keys.map((uri) => '$uri').toList();
     filenames.sort();
@@ skipping 313 matching lines @@
     return result;
   }
 
   Uri script = currentDirectory.resolve(arguments[0]);
   CompilerOptions compilerOptions = new CompilerOptions.parse(
       entryPoint: script,
       libraryRoot: libraryRoot,
       packageRoot: packageRoot,
       packageConfig: packageConfig,
       packagesDiscoveryProvider: findPackages,
-      resolutionInput: resolutionInput,
+      resolutionInputs: resolutionInputs,
       resolutionOutput: resolutionOutput,
       options: options,
       environment: environment);
   return compileFunc(
           compilerOptions, inputProvider, diagnosticHandler, outputProvider)
       .then(compilationDone);
 }
 
 class AbortLeg {
   final message;
@@ skipping 288 matching lines @@
       }
       stderr.writeln(">>> EOF STDERR");
       subscription.resume();
     });
   });
 }
 
 final bool USE_SERIALIZED_DART_CORE =
     Platform.environment['USE_SERIALIZED_DART_CORE'] == 'true';
 
+final Uri _SERIALIZED_URI = Uri.parse('file:fake.data');

[Siggi Cherem (dart-lang), 2016/05/24 18:08:14]

+dartdoc just to remember that this URI is a mock URI only used for our testing
for the time being.

[Johnni Winther, 2016/05/25 07:54:46]

Done.

+
 void _useSerializedDataForDartCore(CompileFunc oldCompileFunc) {
   String serializedData;
 
   Future<api.CompilationResult> compileWithSerializedData(
       CompilerOptions compilerOptions,
       api.CompilerInput compilerInput,
       api.CompilerDiagnostics compilerDiagnostics,
       api.CompilerOutput compilerOutput) async {
     CompilerImpl compiler = new CompilerImpl(
         compilerInput, compilerOutput, compilerDiagnostics, compilerOptions);
-    compiler.serialization.deserializeFromText(serializedData);
+    compiler.serialization.deserializeFromText(
+        _SERIALIZED_URI, serializedData);
     return compiler.run(compilerOptions.entryPoint).then((bool success) {
       return new api.CompilationResult(compiler, isSuccess: success);
     });
   }
 
   Future<api.CompilationResult> generateSerializedDataForDartCore(
       CompilerOptions compilerOptions,
       api.CompilerInput compilerInput,
       api.CompilerDiagnostics compilerDiagnostics,
       api.CompilerOutput compilerOutput) async {
     _CompilerOutput output = new _CompilerOutput();
     api.CompilationResult result = await oldCompileFunc(
         new CompilerOptions.parse(
             entryPoint: Uris.dart_core,
             libraryRoot: compilerOptions.libraryRoot,
             packageRoot: compilerOptions.packageRoot,
             packageConfig: compilerOptions.packageConfig,
             packagesDiscoveryProvider:
                 compilerOptions.packagesDiscoveryProvider,
             environment: compilerOptions.environment,
-            resolutionOutput: Uri.parse('file:fake.data'),
+            resolutionOutput: _SERIALIZED_URI,
             options: [Flags.resolveOnly]),
         compilerInput,
         compilerDiagnostics,
         output);
     serializedData = output.serializedData;
     compileFunc = compileWithSerializedData;
     return compileWithSerializedData(
         compilerOptions, compilerInput, compilerDiagnostics, compilerOutput);
   }
 
@@ skipping 25 matching lines @@
   @override
   void close() {
     // Do nothing.
   }
 
   @override
   void addError(errorEvent, [StackTrace stackTrace]) {
     // Ignore
   }
 }