Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: sdk/lib/_internal/pub_generated/bin/async_compile.dart

Issue 747273003: Add a test for pub's async_await compiler. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/pub_generated/bin/async_compile.dart
diff --git a/sdk/lib/_internal/pub_generated/bin/async_compile.dart b/sdk/lib/_internal/pub_generated/bin/async_compile.dart
index ffdd761d4f4bf9949309312f0b5cf4095dbd2faf..e5a907d19288de5608785594236c3db20ec2ecdd 100644
--- a/sdk/lib/_internal/pub_generated/bin/async_compile.dart
+++ b/sdk/lib/_internal/pub_generated/bin/async_compile.dart
@@ -7,6 +7,7 @@ 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:stack_trace/stack_trace.dart';
import 'package:path/path.dart' as p;
/// The path to pub's root directory (sdk/lib/_internal/pub) in the Dart repo.
@@ -18,7 +19,7 @@ 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.
-final generatedDir = p.join(p.dirname(sourceDir), 'pub_generated');
+String generatedDir;
/// `true` if any file failed to compile.
bool hadFailure = false;
@@ -34,6 +35,30 @@ final _compilerPattern = new RegExp(r"import '(\.\./)+compiler");
/// one.
final _commitPattern = new RegExp(r"[a-f0-9]{40}");
+/// The template for the README that's added to the generated source.
+///
+/// This is used to store the current commit of the async_await compiler.
+const _README = """
+Pub is currently dogfooding the new Dart async/await syntax. Since the Dart VM
+doesn't natively support it yet, we are using the [async-await][] compiler
+package.
+
+[async-await]: https://github.com/dart-lang/async_await
+
+We run that to compile pub-using-await from sdk/lib/_internal/pub down to
+vanilla Dart code which is what you see here. To interoperate more easily with
+the rest of the repositry, we check in that generated code.
+
+When bug #104 is fixed, we can remove this entirely.
+
+The code here was compiled using the async-await compiler at commit:
+
+ <<COMMIT>>
+
+(Note: this file is also parsed by a tool to update the above commit, so be
+careful not to reformat it.)
+""";
+
/// 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
@@ -48,22 +73,30 @@ void main(List<String> arguments) {
var force = false;
parser.addFlag("force", callback: (value) => force = value);
+ var snapshot = true;
+ parser.addFlag("snapshot", callback: (value) => snapshot = value);
+
var buildDir;
try {
var rest = parser.parse(arguments).rest;
if (rest.isEmpty) {
+ throw new FormatException('Missing generated and build directory.');
+ } else if (rest.length == 1) {
throw new FormatException('Missing build directory.');
- } else if (rest.length > 1) {
+ } else if (rest.length > 2) {
throw new FormatException(
- 'Unexpected arguments: ${rest.skip(1).join(" ")}.');
+ 'Unexpected arguments: ${rest.skip(2).join(" ")}.');
}
- buildDir = rest.first;
+ generatedDir = rest[0];
+ buildDir = rest[1];
} on FormatException catch (ex) {
- print(ex);
- print();
- print("Usage: dart async_compile.dart [--verbose] [--force] <build dir>");
+ stderr.writeln(ex);
+ stderr.writeln();
+ stderr.writeln(
+ "Usage: dart async_compile.dart [--verbose] [--force] [--no-snapshot] "
+ "<generated dir> <build dir>");
exit(64);
}
@@ -74,14 +107,21 @@ void main(List<String> arguments) {
var readmePath = p.join(generatedDir, "README.md");
var lastCommit;
- var readme = new File(readmePath).readAsStringSync();
- var match = _commitPattern.firstMatch(readme);
- if (match == null) {
- print("Could not find compiler commit hash in README.md.");
- exit(1);
- }
+ try {
+ 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];
+ lastCommit = match[0];
+ } on IOException catch (error, stackTrace) {
+ if (verbose) {
+ stderr.writeln(
+ "Failed to load $readmePath: $error\n" "${new Trace.from(stackTrace)}");
+ }
+ }
var numFiles = 0;
var numCompiled = 0;
@@ -122,12 +162,11 @@ void main(List<String> arguments) {
// Update the README.
if (currentCommit != lastCommit) {
- readme = readme.replaceAll(_commitPattern, currentCommit);
- _writeFile(readmePath, readme);
+ _writeFile(readmePath, _README.replaceAll("<<COMMIT>>", currentCommit));
if (verbose) print("Updated README.md");
}
- if (numCompiled > 0) _generateSnapshot(buildDir);
+ if (numCompiled > 0 && snapshot) _generateSnapshot(buildDir);
if (verbose) print("Compiled $numCompiled out of $numFiles files");
@@ -150,7 +189,7 @@ String _getCurrentCommit() {
args,
workingDirectory: p.join(sourceDir, "../../../../third_party/pkg/async_await"));
if (result.exitCode != 0) {
- print("Could not get Git revision of async_await compiler.");
+ stderr.writeln("Could not get Git revision of async_await compiler.");
exit(1);
}
@@ -192,7 +231,7 @@ String _translateAsyncAwait(String sourcePath, String source) {
var result = new CodeFormatter().format(CodeKind.COMPILATION_UNIT, source);
return result.source;
} catch (ex) {
- print("Async compile failed on $sourcePath:\n$ex");
+ stderr.writeln("Async compile failed on $sourcePath:\n$ex");
hadFailure = true;
return null;
}
@@ -215,6 +254,7 @@ String _fixDart2jsImports(String sourcePath, String source, String destPath) {
/// build.
void _generateSnapshot(String buildDir) {
buildDir = p.normalize(buildDir);
+ new Directory(dir).createSync(recursive: true);
var entrypoint = p.join(generatedDir, 'bin/pub.dart');
var packageRoot = p.join(buildDir, 'packages');
@@ -225,9 +265,9 @@ void _generateSnapshot(String buildDir) {
["--package-root=$packageRoot", "--snapshot=$snapshot", entrypoint]);
if (result.exitCode != 0) {
- print("Failed to generate snapshot:");
- if (result.stderr.trim().isNotEmpty) print(result.stderr);
- if (result.stdout.trim().isNotEmpty) print(result.stdout);
+ 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);
}

Powered by Google App Engine
This is Rietveld 408576698