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

Unified Diff: pkg/dev_compiler/tool/build_pkgs.dart

Issue 2757753002: Migrate DDC to the new analysis driver.
Patch Set: Rebase Created 3 years, 6 months 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
« no previous file with comments | « pkg/dev_compiler/test/options/options_test.dart ('k') | pkg/dev_compiler/tool/build_sdk.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/dev_compiler/tool/build_pkgs.dart
diff --git a/pkg/dev_compiler/tool/build_pkgs.dart b/pkg/dev_compiler/tool/build_pkgs.dart
index 04be68b647e7ced32845a0d0f21d402e6126df19..85ca884e66f2452a163d027a220fa648c4174428 100755
--- a/pkg/dev_compiler/tool/build_pkgs.dart
+++ b/pkg/dev_compiler/tool/build_pkgs.dart
@@ -1,4 +1,5 @@
#!/usr/bin/env dart
+import 'dart:async';
import 'dart:io';
import 'package:dev_compiler/src/compiler/command.dart';
@@ -11,7 +12,7 @@ import 'package:dev_compiler/src/compiler/command.dart';
///
/// If no arguments are passed, builds the all of the modules tested on Travis.
/// If "test" is passed, only builds the modules needed by the tests.
-void main(List<String> arguments) {
+Future<Null> main(List<String> arguments) async {
var test = arguments.length == 1 && arguments[0] == 'test';
new Directory("gen/codegen_output/pkg").createSync(recursive: true);
@@ -19,42 +20,42 @@ void main(List<String> arguments) {
// Build leaf packages. These have no other package dependencies.
// Under pkg.
- compileModule('async_helper');
- compileModule('expect', libs: ['minitest']);
- compileModule('js', libs: ['js_util']);
- compileModule('meta');
+ await compileModule('async_helper');
+ await compileModule('expect', libs: ['minitest']);
+ await compileModule('js', libs: ['js_util']);
+ await compileModule('meta');
if (!test) {
- compileModule('lookup_map');
- compileModule('microlytics', libs: ['html_channels']);
- compileModule('typed_mock');
+ await compileModule('lookup_map');
+ await compileModule('microlytics', libs: ['html_channels']);
+ await compileModule('typed_mock');
}
// Under third_party/pkg.
- compileModule('collection');
- compileModule('matcher');
- compileModule('path');
+ await compileModule('collection');
+ await compileModule('matcher');
+ await compileModule('path');
if (!test) {
- compileModule('args', libs: ['command_runner']);
- compileModule('charcode');
- compileModule('fixnum');
- compileModule('logging');
- compileModule('markdown');
- compileModule('mime');
- compileModule('plugin', libs: ['manager']);
- compileModule('typed_data');
- compileModule('usage');
- compileModule('utf');
- compileModule('when');
+ await compileModule('args', libs: ['command_runner']);
+ await compileModule('charcode');
+ await compileModule('fixnum');
+ await compileModule('logging');
+ await compileModule('markdown');
+ await compileModule('mime');
+ await compileModule('plugin', libs: ['manager']);
+ await compileModule('typed_data');
+ await compileModule('usage');
+ await compileModule('utf');
+ await compileModule('when');
}
// Composite packages with dependencies.
- compileModule('stack_trace', deps: ['path']);
+ await compileModule('stack_trace', deps: ['path']);
if (!test) {
- compileModule('async', deps: ['collection']);
+ await compileModule('async', deps: ['collection']);
}
if (test) {
- compileModule('unittest',
+ await compileModule('unittest',
deps: ['matcher', 'path', 'stack_trace'],
libs: ['html_config', 'html_individual_config', 'html_enhanced_config'],
unsafeForceCompile: true);
@@ -63,8 +64,10 @@ void main(List<String> arguments) {
/// Compiles a [module] with a single matching ".dart" library and additional
/// [libs] and [deps] on other modules.
-void compileModule(String module,
- {List<String> libs, List<String> deps, bool unsafeForceCompile: false}) {
+Future<Null> compileModule(String module,
+ {List<String> libs,
+ List<String> deps,
+ bool unsafeForceCompile: false}) async {
var args = [
'--dart-sdk-summary=lib/sdk/ddc_sdk.sum',
'-ogen/codegen_output/pkg/$module.js'
@@ -98,7 +101,13 @@ void compileModule(String module,
if (module == 'async_helper') {
args.add('--url-mapping=package:async_helper/async_helper.dart,'
'test/codegen/async_helper.dart');
+ // The custom url-mapping option in Analyzer has changed.
+ // Now the package URI gets turned into a file URI during resolution.
+ //
+ // Because of that, we need a library-root to find the correct root
+ // directory for this package, and thus find the library's name.
+ args.add('--library-root=test/codegen/');
}
- compile(args);
+ await compile(args);
}
« no previous file with comments | « pkg/dev_compiler/test/options/options_test.dart ('k') | pkg/dev_compiler/tool/build_sdk.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698