| Index: pkg/analyzer/lib/src/generated/java_io.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/java_io.dart b/pkg/analyzer/lib/src/generated/java_io.dart
|
| index 757683983922025c70b2d95b8866731e8dcfe882..a9bc0da6d75855321e27ee1b92f8d48c2bea041a 100644
|
| --- a/pkg/analyzer/lib/src/generated/java_io.dart
|
| +++ b/pkg/analyzer/lib/src/generated/java_io.dart
|
| @@ -9,6 +9,7 @@ class JavaSystemIO {
|
| static String getProperty(String name) {
|
| {
|
| String value = _properties[name];
|
| +// print('getProperty[$name].1: $value');
|
| if (value != null) {
|
| return value;
|
| }
|
| @@ -24,25 +25,34 @@ class JavaSystemIO {
|
| }
|
| if (name == 'com.google.dart.sdk') {
|
| String value = Platform.environment['DART_SDK'];
|
| - if (value != null) {
|
| - _properties[name] = value;
|
| - return value;
|
| - }
|
| + print(Platform.environment);
|
| + print('current: ${pathos.current}');
|
| + print('exec: ${Platform.executable}');
|
| + print('execDir: ${pathos.dirname(Platform.executable)}');
|
| + print('getProperty[$name].2: $value');
|
| +// throw "";
|
| +// if (value != null) {
|
| +// _properties[name] = value;
|
| +// return value;
|
| +// }
|
| }
|
| if (name == 'com.google.dart.sdk') {
|
| String exec = Platform.executable;
|
| if (exec.length != 0) {
|
| String sdkPath;
|
| - // may be "xcodebuild/ReleaseIA32/dart" with "dart-sdk" sibling
|
| + // may be "xcodebuild/ReleaseIA32/dart" with "sdk" sibling
|
| {
|
| - sdkPath = pathos.join(pathos.dirname(exec), "dart-sdk");
|
| + var outDir = pathos.dirname(pathos.dirname(exec));
|
| + sdkPath = pathos.join(pathos.dirname(outDir), "sdk");
|
| if (new Directory(sdkPath).existsSync()) {
|
| _properties[name] = sdkPath;
|
| + print('sdkPath.2: $sdkPath');
|
| return sdkPath;
|
| }
|
| }
|
| // probably be "dart-sdk/bin/dart"
|
| sdkPath = pathos.dirname(pathos.dirname(exec));
|
| + print('sdkPath.3: $sdkPath');
|
| _properties[name] = sdkPath;
|
| return sdkPath;
|
| }
|
|
|