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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: compiler/dart-compiler.gyp

Issue 9865025: Revert "Removes dartc reliance on its own libraries, now can be targeted at any implementation's li… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 9 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 | « no previous file | compiler/dartc.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/dart-compiler.gyp
diff --git a/compiler/dart-compiler.gyp b/compiler/dart-compiler.gyp
index d676d334da3810e4f9ddd85f4065e04925f325b4..b7f4a57801ee2d275f0875f79e4ba6f0251f9138 100644
--- a/compiler/dart-compiler.gyp
+++ b/compiler/dart-compiler.gyp
@@ -6,6 +6,12 @@
'includes': [
'sources.gypi',
'test_sources.gypi',
+ 'corelib_sources.gypi',
+ 'compiler_corelib_sources.gypi',
+ 'domlib_sources.gypi',
+ 'htmllib_sources.gypi',
+ 'jsonlib_sources.gypi',
+ 'isolatelib_sources.gypi',
],
'targets': [
{
@@ -23,12 +29,17 @@
'<@(java_resources)',
'<@(javatests_sources)',
'<@(javatests_resources)',
+ '<@(corelib_sources)',
+ '<@(corelib_resources)',
+ '<@(compiler_corelib_sources)',
+ '<@(compiler_corelib_resources)',
'dartc.xml',
'scripts/dartc.sh',
'scripts/dartc_run.sh',
'scripts/dartc_metrics.sh',
'../third_party/args4j/2.0.12/args4j-2.0.12.jar',
'../third_party/guava/r09/guava-r09.jar',
+ '../third_party/json/r2_20080312/json.jar',
'../third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
'../third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
'../third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
@@ -40,6 +51,7 @@
'<(PRODUCT_DIR)/compiler/lib/args4j/2.0.12/args4j-2.0.12.jar',
'<(PRODUCT_DIR)/compiler/lib/dartc.jar',
'<(PRODUCT_DIR)/compiler/lib/guava/r09/guava-r09.jar',
+ '<(PRODUCT_DIR)/compiler/lib/json/r2_20080312/json.jar',
],
'action' : [
'../third_party/apache_ant/v1_7_1/bin/ant',
@@ -67,6 +79,139 @@
'outputs': [ '<(PRODUCT_DIR)/dartc' ],
'action': [ 'cp', 'scripts/dartc_wrapper.py', '<@(_outputs)' ]
},
+ {
+ 'message': 'Collect system libraries',
+ 'action_name': 'collect_systemlibrary',
+ 'inputs': [
+ '<(PRODUCT_DIR)/compiler/bin/dartc',
+ 'dartc.xml',
+ 'domlib_sources.gypi',
+ '<@(domlib_sources)',
+ '<@(domlib_resources)',
+ 'htmllib_sources.gypi',
+ '<@(htmllib_sources)',
+ '<@(htmllib_resources)',
+ 'jsonlib_sources.gypi',
+ '<@(jsonlib_sources)',
+ '<@(jsonlib_resources)',
+ 'isolatelib_sources.gypi',
+ '<@(isolatelib_sources)',
+ '<@(isolatelib_resources)',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/syslib.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/corelib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/domlib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/htmllib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/jsonlib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/isolatelib.jar.stamp',
+ ],
+ 'action': [
+ '../third_party/apache_ant/v1_7_1/bin/ant',
+ '-f', 'dartc.xml',
+ '-Dbuild.dir=<(INTERMEDIATE_DIR)/<(_target_name)',
+ '-Ddist.dir=<(PRODUCT_DIR)/compiler',
+ 'syslib_clean',
+ 'syslib',
+ ],
+ },
+ {
+ 'message': 'Compiling dart system libraries to <(INTERMEDIATE_DIR)/<(_target_name)/api',
+ 'action_name': 'compile_systemlibrary',
+ 'inputs': [
+ '<(PRODUCT_DIR)/dartc',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/syslib.stamp',
+ 'api.dart',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/core/com/google/dart/corelib/corelib.dart.deps',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/dom/dom/dom.dart.deps',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/html/html/html.dart.deps',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/json/json/json.dart.deps',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/isolate/isolate/isolate_compiler.dart.deps',
+ ],
+ 'action': [
+ '<(PRODUCT_DIR)/dartc', 'api.dart',
+ '--fatal-warnings', '--fatal-type-errors',
+ '-out', '<(INTERMEDIATE_DIR)/<(_target_name)/api',
+ ],
+ },
+ {
+ 'message': 'Packaging dart:core artifacts',
+ 'action_name': 'package_corelib_artifacts',
+ 'inputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/corelib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/core/com/google/dart/corelib/corelib.dart.deps',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/compiler/lib/corelib.jar',
+ ],
+ 'action': [
+ 'jar', 'u0f', '<(PRODUCT_DIR)/compiler/lib/corelib.jar', '-C', '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/core', 'com',
+ ],
+ },
+ {
+ 'message': 'Packaging dart:dom artifacts',
+ 'action_name': 'package_domlib_artifacts',
+ 'inputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/domlib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/dom/dom/dom.dart.deps',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/compiler/lib/domlib.jar',
+ ],
+ 'action': [
+ 'jar', 'u0f', '<(PRODUCT_DIR)/compiler/lib/domlib.jar', '-C', '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/dom', 'dom',
+ ],
+ },
+ {
+ 'message': 'Packaging dart:html artifacts',
+ 'action_name': 'package_htmllib_artifacts',
+ 'inputs': [
+ 'htmllib_sources.gypi',
+ '<@(htmllib_sources)',
+ '<@(htmllib_resources)',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/htmllib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/html/html/html.dart.deps',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/compiler/lib/htmllib.jar',
+ ],
+ 'action': [
+ 'jar', 'u0f', '<(PRODUCT_DIR)/compiler/lib/htmllib.jar', '-C', '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/html', 'html',
+ ],
+ },
+ {
+ 'message': 'Packaging dart:json artifacts',
+ 'action_name': 'package_jsonlib_artifacts',
+ 'inputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/jsonlib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/json/json/json.dart.deps',
+ 'api.dart',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/compiler/lib/jsonlib.jar',
+ ],
+ 'action': [
+ 'jar', 'u0f', '<(PRODUCT_DIR)/compiler/lib/jsonlib.jar', '-C', '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/json', 'json',
+ ],
+ },
+ {
+ 'message': 'Packaging dart:isolate artifacts',
+ 'action_name': 'package_isolatelib_artifacts',
+ 'inputs': [
+ '<(INTERMEDIATE_DIR)/<(_target_name)/isolatelib.jar.stamp',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/isolate/isolate/isolate_compiler.dart.deps',
+ 'api.dart',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/compiler/lib/isolatelib.jar',
+ ],
+ 'action': [
+ 'jar', 'u0f', '<(PRODUCT_DIR)/compiler/lib/isolatelib.jar', '-C',
+ '<(INTERMEDIATE_DIR)/<(_target_name)/api/dart/isolate', 'isolate',
+ ],
+ },
],
},
{
« no previous file with comments | « no previous file | compiler/dartc.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698