Revert 30138

Review URL: https://codereview.chromium.org//67943004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@30139 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ricow@google.com 2013-11-10 12:15:44 +00:00
parent c65bcc6816
commit 93b46fd26f
2 changed files with 24 additions and 26 deletions

View file

@ -16,7 +16,30 @@
],
'actions': [
{
'action_name': 'generate_snapshots',
'action_name': 'generate_dart2js_snapshot',
'inputs': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'../../sdk/lib/_internal/libraries.dart',
'<!@(["python", "../../tools/list_files.py", "\\.dart$",'
' "../../sdk/lib/_internal/compiler", "../../runtime/lib"])',
'../../sdk/lib/_internal/libraries.dart',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
# Note: we don't store the snapshot in the location where
# the dart2js script is looking for it. The motivation
# for that is to support an incremental development model
# for dart2js compiler engineers. However, we install the
# snapshot in the proper location when building the SDK.
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
'../../sdk/lib/_internal/compiler/implementation/dart2js.dart',
],
},
{
'action_name': 'generate_dartdoc_snapshot',
'inputs': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'../../sdk/lib/_internal/libraries.dart',
@ -26,7 +49,6 @@
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/utils_wrapper.dart.snapshot',
'<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',

View file

@ -42,23 +42,6 @@ void main(List<String> arguments) {
});
}
Future<String> getDart2jsSnapshotGenerationFile(var args, var rootPath) {
var dart2js = rootPath.resolve(args["dart2js_main"]);
return getVersion(rootPath).then((version) {
var snapshotGenerationText =
"""
import '${dart2js.toFilePath(windows: false)}' as dart2jsMain;
import 'dart:io';
void main(List<String> arguments) {
dart2jsMain.BUILD_ID = "$version";
dart2jsMain.main(arguments.skip(1).toList());
}
""";
return snapshotGenerationText;
});
}
void writeSnapshotFile(var path, var content) {
File file = new File(path);
var writer = file.openSync(mode: FileMode.WRITE);
@ -108,11 +91,4 @@ void main(List<String> arguments) {
writeSnapshotFile(wrapper, result);
createSnapshot(wrapper, args["package_root"]);
});
getDart2jsSnapshotGenerationFile(args, rootPath).then((result) {
var wrapper = "${args['output_dir']}/dart2js.dart";
writeSnapshotFile(wrapper, result);
createSnapshot(wrapper, args["package_root"]);
});
}