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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 | 210 |
211 CompilationCommand computeCompilationCommand( | 211 CompilationCommand computeCompilationCommand( |
212 String outputFileName, | 212 String outputFileName, |
213 String buildDir, | 213 String buildDir, |
214 CommandBuilder commandBuilder, | 214 CommandBuilder commandBuilder, |
215 List arguments, | 215 List arguments, |
216 Map<String, String> environmentOverrides) { | 216 Map<String, String> environmentOverrides) { |
217 arguments = new List.from(arguments); | 217 arguments = new List.from(arguments); |
218 arguments.add('--out=$outputFileName'); | 218 arguments.add('--out=$outputFileName'); |
219 | 219 |
220 // We want all dart2js compilers to run the vm with the | |
221 // --abort-on-assertion-errors flag. | |
222 // We have allowed constant maps as environmentOverrides, | |
223 // so we modify a new map. | |
224 var newOverrides = {'DART_VM_OPTIONS': '--abort-on-assertion-errors'}; | |
225 if (environmentOverrides != null) { | |
226 newOverrides.addAll(environmentOverrides); | |
227 if (environmentOverrides.containsKey('DART_VM_OPTIONS')) { | |
228 newOverrides['DART_VM_OPTIONS'] += ' --abort-on-assertion-errors'; | |
229 } | |
230 } | |
231 return commandBuilder.getCompilationCommand( | 220 return commandBuilder.getCompilationCommand( |
232 moniker, outputFileName, !useSdk, | 221 moniker, outputFileName, !useSdk, |
233 bootstrapDependencies(buildDir), | 222 bootstrapDependencies(buildDir), |
234 computeCompilerPath(buildDir), | 223 computeCompilerPath(buildDir), |
235 arguments, newOverrides); | 224 arguments, environmentOverrides); |
236 } | 225 } |
237 | 226 |
238 List<Uri> bootstrapDependencies(String buildDir) { | 227 List<Uri> bootstrapDependencies(String buildDir) { |
239 if (!useSdk) return const <Uri>[]; | 228 if (!useSdk) return const <Uri>[]; |
240 return _bootstrapDependenciesCache.putIfAbsent(buildDir, () => | 229 return _bootstrapDependenciesCache.putIfAbsent(buildDir, () => |
241 [Uri.base.resolveUri(nativeDirectoryToUri(buildDir)) | 230 [Uri.base.resolveUri(nativeDirectoryToUri(buildDir)) |
242 .resolve('dart-sdk/bin/snapshots/dart2js.dart.snapshot')]); | 231 .resolve('dart-sdk/bin/snapshots/dart2js.dart.snapshot')]); |
243 } | 232 } |
244 } | 233 } |
245 | 234 |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 RuntimeConfiguration runtimeConfiguration, | 529 RuntimeConfiguration runtimeConfiguration, |
541 String buildDir, | 530 String buildDir, |
542 TestInformation info, | 531 TestInformation info, |
543 List<String> vmOptions, | 532 List<String> vmOptions, |
544 List<String> sharedOptions, | 533 List<String> sharedOptions, |
545 List<String> originalArguments, | 534 List<String> originalArguments, |
546 CommandArtifact artifact) { | 535 CommandArtifact artifact) { |
547 return <String>[]; | 536 return <String>[]; |
548 } | 537 } |
549 } | 538 } |
OLD | NEW |