OLD | NEW |
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library compiler_configuration; | 5 library compiler_configuration; |
6 | 6 |
7 import 'dart:io' show | 7 import 'dart:io' show |
8 Platform; | 8 Platform; |
9 | 9 |
10 import 'runtime_configuration.dart' show | 10 import 'runtime_configuration.dart' show |
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 : super._subclass( | 343 : super._subclass( |
344 isDebug: isDebug, isChecked: isChecked, | 344 isDebug: isDebug, isChecked: isChecked, |
345 isHostChecked: isHostChecked, useSdk: useSdk); | 345 isHostChecked: isHostChecked, useSdk: useSdk); |
346 | 346 |
347 int computeTimeoutMultiplier() { | 347 int computeTimeoutMultiplier() { |
348 return 4; | 348 return 4; |
349 } | 349 } |
350 | 350 |
351 String computeCompilerPath(String buildDir) { | 351 String computeCompilerPath(String buildDir) { |
352 String suffix = executableScriptSuffix; | 352 String suffix = executableScriptSuffix; |
353 return 'sdk/bin/dartanalyzer_developer$suffix'; | 353 return 'sdk/bin/dartanalyzer_java$suffix'; |
354 } | 354 } |
355 | 355 |
356 CommandArtifact computeCompilationArtifact( | 356 CommandArtifact computeCompilationArtifact( |
357 String buildDir, | 357 String buildDir, |
358 String tempDir, | 358 String tempDir, |
359 CommandBuilder commandBuilder, | 359 CommandBuilder commandBuilder, |
360 List arguments, | 360 List arguments, |
361 Map<String, String> environmentOverrides) { | 361 Map<String, String> environmentOverrides) { |
362 return new CommandArtifact( | 362 return new CommandArtifact( |
363 <Command>[ | 363 <Command>[ |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 String computeCompilerPath(String buildDir) { | 395 String computeCompilerPath(String buildDir) { |
396 var prefix = 'sdk/bin'; | 396 var prefix = 'sdk/bin'; |
397 String suffix = executableScriptSuffix; | 397 String suffix = executableScriptSuffix; |
398 if (isHostChecked) { | 398 if (isHostChecked) { |
399 if (useSdk) { | 399 if (useSdk) { |
400 throw "--host-checked and --use-sdk cannot be used together"; | 400 throw "--host-checked and --use-sdk cannot be used together"; |
401 } | 401 } |
402 // The script dartanalyzer_developer is not included in the | 402 // The script dartanalyzer_developer is not included in the |
403 // shipped SDK, that is the script is not installed in | 403 // shipped SDK, that is the script is not installed in |
404 // "$buildDir/dart-sdk/bin/" | 404 // "$buildDir/dart-sdk/bin/" |
405 // TODO(paulberry): the script dartanalyzer_developer currently | 405 return '$prefix/dartanalyzer_developer$suffix'; |
406 // points to the wrong place (the Java-based analyzer). Once | |
407 // this is fixed, we should run dartanalyzer_developer when in | |
408 // isHostChecked mode. | |
409 } | 406 } |
410 if (useSdk) { | 407 if (useSdk) { |
411 prefix = '$buildDir/dart-sdk/bin'; | 408 prefix = '$buildDir/dart-sdk/bin'; |
412 } | 409 } |
413 return '$prefix/dartanalyzer$suffix'; | 410 return '$prefix/dartanalyzer$suffix'; |
414 } | 411 } |
415 } | 412 } |
OLD | NEW |