| 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 List<String> computeRuntimeArguments( | 263 List<String> computeRuntimeArguments( |
| 264 RuntimeConfiguration runtimeConfiguration, | 264 RuntimeConfiguration runtimeConfiguration, |
| 265 String buildDir, | 265 String buildDir, |
| 266 TestInformation info, | 266 TestInformation info, |
| 267 List<String> vmOptions, | 267 List<String> vmOptions, |
| 268 List<String> sharedOptions, | 268 List<String> sharedOptions, |
| 269 List<String> originalArguments, | 269 List<String> originalArguments, |
| 270 CommandArtifact artifact) { | 270 CommandArtifact artifact) { |
| 271 Uri sdk = useSdk ? | 271 Uri sdk = useSdk ? |
| 272 nativeDirectoryToUri(buildDir).resolve('dart-sdk/') : | 272 nativeDirectoryToUri(buildDir).resolve('dart-sdk/') : |
| 273 nativeDirectoryToUri(TestUtils.dartDir().toNativePath()) | 273 nativeDirectoryToUri(TestUtils.dartDir.toNativePath()).resolve('sdk/'); |
| 274 .resolve('sdk/'); | |
| 275 Uri preambleDir = sdk.resolve('lib/_internal/lib/preambles/'); | 274 Uri preambleDir = sdk.resolve('lib/_internal/lib/preambles/'); |
| 276 return runtimeConfiguration.dart2jsPreambles(preambleDir) | 275 return runtimeConfiguration.dart2jsPreambles(preambleDir) |
| 277 ..add(artifact.filename); | 276 ..add(artifact.filename); |
| 278 } | 277 } |
| 279 } | 278 } |
| 280 | 279 |
| 281 /// Configuration for dart2dart compiler. | 280 /// Configuration for dart2dart compiler. |
| 282 class Dart2dartCompilerConfiguration extends Dart2xCompilerConfiguration { | 281 class Dart2dartCompilerConfiguration extends Dart2xCompilerConfiguration { |
| 283 Dart2dartCompilerConfiguration({ | 282 Dart2dartCompilerConfiguration({ |
| 284 bool isDebug, | 283 bool isDebug, |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 bool isDebug, | 382 bool isDebug, |
| 384 bool isChecked, | 383 bool isChecked, |
| 385 bool isHostChecked, | 384 bool isHostChecked, |
| 386 bool useSdk}) | 385 bool useSdk}) |
| 387 : super( | 386 : super( |
| 388 'dart2analyzer', isDebug: isDebug, isChecked: isChecked, | 387 'dart2analyzer', isDebug: isDebug, isChecked: isChecked, |
| 389 isHostChecked: isHostChecked, useSdk: useSdk); | 388 isHostChecked: isHostChecked, useSdk: useSdk); |
| 390 | 389 |
| 391 String computeCompilerPath(String buildDir) => 'editor/tools/analyzer'; | 390 String computeCompilerPath(String buildDir) => 'editor/tools/analyzer'; |
| 392 } | 391 } |
| OLD | NEW |