Store the async-await compiled pub code directly in the repo.

sdk/lib/_internal/pub/bin/async_compile.dart

Index: sdk/lib/_internal/pub/bin/async_compile.dart
diff --git a/sdk/lib/_internal/pub/bin/async_compile.dart b/sdk/lib/_internal/pub/bin/async_compile.dart
index c8d56813a7cebb806ec3e0389745c85d1b377a9c..992991fb25a7276537eafe4aa8093856b8c67906 100644
--- a/sdk/lib/_internal/pub/bin/async_compile.dart
+++ b/sdk/lib/_internal/pub/bin/async_compile.dart
@@ -4,17 +4,11 @@
 
 import 'dart:io';
 
+import 'package:args/args.dart';
+import 'package:analyzer/src/services/formatter_impl.dart';
 import 'package:async_await/async_await.dart' as async_await;
 import 'package:path/path.dart' as p;
 
-/// A changing string that indicates the "version" or timestamp of the compiler
-/// that the current sources were compiled against.
-///
-/// Increment this whenever a meaningful change in the async/await compiler
-/// itself is landed. Bumping this will force all previously compiled files
-/// that were compiled against an older compiler to be recompiled.
-const COMPILER_VERSION = "2";
-
 /// The path to pub's root directory (sdk/lib/_internal/pub) in the Dart repo.
 ///
 /// This assumes this script is itself being run from within the repo.
@@ -24,13 +18,22 @@ final sourceDir = p.dirname(p.dirname(p.fromUri(Platform.script)));
 final sourceUrl = p.toUri(sourceDir).toString();
 
 /// The directory that compiler output should be written to.
-String buildDir;
+final generatedDir = p.join(p.dirname(sourceDir), 'pub_generated');
 
 /// `true` if any file failed to compile.
 bool hadFailure = false;
 
+bool verbose = false;
+
+/// Prefix for imports in pub that import dart2js libraries.
 final _compilerPattern = new RegExp(r"import '(\.\./)+compiler");
 
+/// Matches the Git commit hash of the compiler stored in the README.md file.
+///
+/// This is used both to find the current commit and replace it with the new
+/// one.
+final _commitPattern = new RegExp(r"[a-f0-9]{40,40}");

[nweiz, 2014/09/08 23:17:05]

"{40,40}" -> "{40}"

[Bob Nystrom, 2014/09/09 17:01:04]

Done.

+
 /// This runs the async/await compiler on all of the pub source code.
 ///
 /// It reads from the repo and writes the compiled output into the given build
@@ -38,28 +41,56 @@ final _compilerPattern = new RegExp(r"import '(\.\./)+compiler");
 /// compile files that haven't changed since the last time they were compiled.
 // TODO(rnystrom): Remove this when #104 is fixed.
 void main(List<String> arguments) {
-  _validate(arguments.isNotEmpty, "Missing build directory.");
-  _validate(arguments.length <= 2, "Unexpected arguments.");
-  if (arguments.length == 2) {
-    _validate(arguments[1] == "--silent",
-        "Invalid argument '${arguments[1]}");
-  }
+  var parser = new ArgParser(allowTrailingOptions: true);
 
-  // Create the build output directory if it's not already there.
-  buildDir = p.join(p.normalize(arguments[0]), "pub_async");
-  new Directory(buildDir).createSync(recursive: true);
+  parser.addFlag("verbose", callback: (value) => verbose = value);
+
+  var force = false;
+  parser.addFlag("force", callback: (value) => force = value);
+
+  var buildDir;
 
-  // See if the current sources were compiled against a different version of the
-  // compiler.
-  var versionPath = p.join(buildDir, "compiler.version");
-  var version = "none";
   try {
-    version = new File(versionPath).readAsStringSync();
-  } on IOException catch (ex) {
-    // Do nothing. The version file didn't exist.
+    var rest = parser.parse(arguments).rest;
+    if (rest.isEmpty) {
+      throw new FormatException('Missing build directory.');
+    } else if (rest.length > 1) {
+      throw new FormatException(
+          'Unexpected arguments: ${rest.skip(1).join(" ")}.');
+    }
+
+    buildDir = rest.first;
+  } on FormatException catch(ex) {
+    stderr.writeln(ex);
+    stderr.writeln();
+    stderr.writeln(
+        "Usage: dart async_compile.dart [--verbose] [--force] <build dir>");
+    exit(64);
   }
 
-  var silent = arguments.length == 2 && arguments[1] == "--silent";
+  // See what version (i.e. Git commit) of the async-await compiler we
+  // currently have. If this is different from the version that was used to
+  // compile the sources, recompile everything.
+  var result = Process.runSync("git", ["rev-parse", "HEAD"], workingDirectory:
+      p.join(sourceDir, "../../../../third_party/pkg/async_await"));
+  if (result.exitCode != 0) {
+    stderr.writeln("Could not get Git revision of async_await compiler.");
+    exit(1);
+  }
+
+  var currentCommit = result.stdout.trim();
+
+  var readmePath = p.join(generatedDir, "README.md");
+  var lastCommit;
+  var readme = new File(readmePath).readAsStringSync();
+  var match = _commitPattern.firstMatch(readme);
+  if (match == null) {
+    stderr.writeln("Could not find compiler commit hash in README.md.");
+    exit(1);
+  }
+
+  lastCommit = match[0];
+
   var numFiles = 0;
   var numCompiled = 0;
 
@@ -67,28 +98,31 @@ void main(List<String> arguments) {
   for (var entry in new Directory(sourceDir).listSync(recursive: true)) {
     if (p.extension(entry.path) != ".dart") continue;
 
-    // Skip tests.
-    // TODO(rnystrom): Do we want to use this for tests too?
-    if (p.isWithin(p.join(sourceDir, "test"), entry.path)) continue;
-
     numFiles++;
     var relative = p.relative(entry.path, from: sourceDir);
 
     var sourceFile = entry as File;
-    var destPath = p.join(buildDir, relative);
+    var destPath = p.join(generatedDir, relative);
     var destFile = new File(destPath);
-    if (version != COMPILER_VERSION ||
+    if (force ||
+        currentCommit != lastCommit ||
         !destFile.existsSync() ||
         entry.lastModifiedSync().isAfter(destFile.lastModifiedSync())) {
       _compile(sourceFile.path, sourceFile.readAsStringSync(), destPath);
       numCompiled++;
-      if (!silent) print("Compiled ${sourceFile.path}.");
+      if (verbose) print("Compiled $relative");
     }
   }
 
-  _writeFile(versionPath, COMPILER_VERSION);
+  // Update the README.
+  if (currentCommit != lastCommit) {
+    readme = readme.replaceAll(_commitPattern, currentCommit);
+    _writeFile(readmePath, readme);
+  }
+
+  if (verbose) print("Compiled $numCompiled out of $numFiles files");
 
-  if (!silent) print("Compiled $numCompiled out of $numFiles files.");
+  if (numCompiled > 0) _generateSnapshot(buildDir);
 
   if (hadFailure) exit(1);
 }
@@ -120,7 +154,13 @@ String _translateAsyncAwait(String sourcePath, String source) {
   }
 
   try {
-    return async_await.compile(source);
+    source = async_await.compile(source);
+
+    // Reformat the result since the compiler ditches all whitespace.
+    // TODO(rnystrom): Remove when this is fixed:
+    // https://github.com/dart-lang/async_await/issues/12
+    var result = new CodeFormatter().format(CodeKind.COMPILATION_UNIT, source);
+    return result.source;
   } catch (ex) {
     stderr.writeln("Async compile failed on $sourcePath:\n$ex");
     hadFailure = true;
@@ -139,15 +179,30 @@ String _fixDart2jsImports(String sourcePath, String source, String destPath) {
   return source.replaceAll(_compilerPattern, "import '$relative");
 }
 
-/// Validates command-line argument usage and exits with [message] if [valid]
-/// is `false`.
-void _validate(bool valid, String message) {
-  if (valid) return;
+/// Regenerate the pub snapshot from the async/await-compiled output. We do
+/// this here since the tests need it and it's faster than doing a full SDK
+/// build.
+void _generateSnapshot(String buildDir) {
+  buildDir = p.normalize(buildDir);
+
+  var entrypoint = p.join(generatedDir, 'bin/pub.dart');
+  var packageRoot = p.join(buildDir, 'packages');
+  var snapshot = p.join(buildDir, 'dart-sdk/bin/snapshots/pub.dart.snapshot');
+
+  var result = Process.runSync(Platform.executable, [
+    "--package-root=$packageRoot",
+    "--snapshot=$snapshot",
+    entrypoint
+  ]);
+
+  if (result.exitCode != 0) {
+    stderr.writeln("Failed to generate snapshot:");
+    if (result.stderr.trim().isNotEmpty) stderr.writeln(result.stderr);
+    if (result.stdout.trim().isNotEmpty) stderr.writeln(result.stdout);
+    exit(result.exitCode);
+  }
 
-  stderr.writeln(message);
-  stderr.writeln();
-  stderr.writeln("Usage: dart async_compile.dart <build dir> [--silent]");
-  exit(64);
+  if (verbose) print("Created pub snapshot");
 }
 
 /// Deletes the file at [path], ignoring any IO errors that occur.