Index: compiler/dart-compiler.gyp |
diff --git a/compiler/dart-compiler.gyp b/compiler/dart-compiler.gyp |
index 7bfd9364e82922765d8d8aa4bd05e35d55b1c701..ce1012400b3f5332afda9a6f387e036d34e0113c 100644 |
--- a/compiler/dart-compiler.gyp |
+++ b/compiler/dart-compiler.gyp |
@@ -9,11 +9,23 @@ |
], |
'targets': [ |
{ |
- 'target_name': 'dartc', |
+ 'target_name': 'dart_analyzer', |
'type': 'none', |
+ 'conditions': [ |
+ [ 'OS!="win"', { |
+ 'variables': { |
+ 'script_suffix': '', |
+ }, |
+ }], |
+ [ 'OS=="win"', { |
+ 'variables': { |
+ 'script_suffix': '.bat', |
+ }, |
+ }], |
+ ], |
'actions': [ |
{ |
- 'action_name': 'build_dartc', |
+ 'action_name': 'build_dart_analyzer', |
'inputs': [ |
'sources.gypi', |
'test_sources.gypi', |
@@ -21,10 +33,9 @@ |
'<@(java_resources)', |
'<@(javatests_sources)', |
'<@(javatests_resources)', |
- 'dartc.xml', |
- 'scripts/dartc.sh', |
- 'scripts/dartc_run.sh', |
- 'scripts/dartc_metrics.sh', |
+ 'dart_analyzer.xml', |
+ 'scripts/dart_analyzer.sh', |
+ 'scripts/analyzer_metrics.sh', |
'../third_party/args4j/2.0.12/args4j-2.0.12.jar', |
'../third_party/guava/r09/guava-r09.jar', |
'../third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar', |
@@ -34,37 +45,28 @@ |
], |
'outputs': [ |
'<(INTERMEDIATE_DIR)/<(_target_name)/tests.jar', |
- '<(PRODUCT_DIR)/compiler/bin/dartc', |
- '<(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)/analyzer/bin/dart_analyzer', |
+ '<(PRODUCT_DIR)/analyzer/util/analyzer/dart_analyzer.jar', |
+ '<(PRODUCT_DIR)/analyzer/util/analyzer/args4j/2.0.12/args4j-2.0.12.jar', |
+ '<(PRODUCT_DIR)/analyzer/util/analyzer/guava/r09/guava-r09.jar', |
], |
'action' : [ |
- '../third_party/apache_ant/v1_7_1/bin/ant', |
- '-f', 'dartc.xml', |
+ '../third_party/apache_ant/v1_7_1/bin/ant<(script_suffix)', |
+ '-f', 'dart_analyzer.xml', |
'-Dbuild.dir=<(INTERMEDIATE_DIR)/<(_target_name)', |
- '-Ddist.dir=<(PRODUCT_DIR)/compiler', |
+ '-Ddist.dir=<(PRODUCT_DIR)/analyzer', |
'clean', |
'dist', |
'tests.jar', |
], |
- 'message': 'Building dartc.', |
+ 'message': 'Building dart_analyzer.', |
}, |
{ |
'action_name': 'copy_tests', |
'inputs': [ '<(INTERMEDIATE_DIR)/<(_target_name)/tests.jar' ], |
- 'outputs': [ '<(PRODUCT_DIR)/compiler-tests.jar' ], |
+ 'outputs': [ '<(PRODUCT_DIR)/analyzer/dart_analyzer_tests.jar' ], |
'action': [ 'cp', '<@(_inputs)', '<@(_outputs)' ] |
}, |
- { |
- 'action_name': 'copy_dartc_wrapper', |
- 'inputs': [ |
- '<(PRODUCT_DIR)/compiler/lib/dartc.jar', |
- 'scripts/dartc_wrapper.py', |
- ], |
- 'outputs': [ '<(PRODUCT_DIR)/dartc' ], |
- 'action': [ 'cp', 'scripts/dartc_wrapper.py', '<@(_outputs)' ] |
- }, |
], |
}, |
{ |