| OLD | NEW | 
|---|
| 1 #!/bin/bash | 1 #!/bin/bash | 
| 2 # Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file | 2 # Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file | 
| 3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a | 
| 4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. | 
| 5 | 5 | 
| 6 # Run dartanalyzer.dart on the Dart VM. This script assumes the Dart repo's | 6 # Run dartanalyzer.dart on the Dart VM. This script assumes the Dart repo's | 
| 7 # directory structure. | 7 # directory structure. | 
| 8 | 8 | 
| 9 function follow_links() { | 9 function follow_links() { | 
| 10   file="$1" | 10   file="$1" | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 49 then | 49 then | 
| 50   OUT_DIR="$DART_ROOT/xcodebuild/" | 50   OUT_DIR="$DART_ROOT/xcodebuild/" | 
| 51 else | 51 else | 
| 52   OUT_DIR="$DART_ROOT/out/" | 52   OUT_DIR="$DART_ROOT/out/" | 
| 53 fi | 53 fi | 
| 54 | 54 | 
| 55 if [ -z "$DART_CONFIGURATION" ]; | 55 if [ -z "$DART_CONFIGURATION" ]; | 
| 56 then | 56 then | 
| 57   DIRS=$( ls "$OUT_DIR" ) | 57   DIRS=$( ls "$OUT_DIR" ) | 
| 58   # list of possible configurations in decreasing desirability | 58   # list of possible configurations in decreasing desirability | 
| 59   CONFIGS=("ReleaseIA32" "ReleaseX64" "DebugIA32" "DebugX64" | 59   CONFIGS=("ReleaseX64" "ReleaseIA32" "DebugX64" "DebugIA32" | 
| 60     "ReleaseARM"    "ReleaseARM64"    "ReleaseARMV5TE"    "ReleaseMIPS" | 60     "ReleaseARM"    "ReleaseARM64"    "ReleaseARMV5TE"    "ReleaseMIPS" | 
| 61     "DebugARM"      "DebugARM64"      "DebugARMV5TE"      "DebugMIPS") | 61     "DebugARM"      "DebugARM64"      "DebugARMV5TE"      "DebugMIPS") | 
| 62   DART_CONFIGURATION="None" | 62   DART_CONFIGURATION="None" | 
| 63   for CONFIG in ${CONFIGS[*]} | 63   for CONFIG in ${CONFIGS[*]} | 
| 64   do | 64   do | 
| 65     for DIR in $DIRS; | 65     for DIR in $DIRS; | 
| 66     do | 66     do | 
| 67       if [ "$CONFIG" = "$DIR" ]; | 67       if [ "$CONFIG" = "$DIR" ]; | 
| 68       then | 68       then | 
| 69         # choose most desirable configuration that is available and break | 69         # choose most desirable configuration that is available and break | 
| 70         DART_CONFIGURATION="$DIR" | 70         DART_CONFIGURATION="$DIR" | 
| 71         break 2 | 71         break 2 | 
| 72       fi | 72       fi | 
| 73     done | 73     done | 
| 74   done | 74   done | 
| 75   if [ "$DART_CONFIGURATION" = "None" ] | 75   if [ "$DART_CONFIGURATION" = "None" ] | 
| 76   then | 76   then | 
| 77     echo "No valid dart configuration found in $OUT_DIR" | 77     echo "No valid dart configuration found in $OUT_DIR" | 
| 78     exit 1 | 78     exit 1 | 
| 79   fi | 79   fi | 
| 80 fi | 80 fi | 
| 81 | 81 | 
| 82 BUILD_DIR="$OUT_DIR$DART_CONFIGURATION" | 82 BUILD_DIR="$OUT_DIR$DART_CONFIGURATION" | 
| 83 | 83 | 
| 84 PACKAGE_ROOT="$BUILD_DIR/packages/" | 84 PACKAGE_ROOT="$BUILD_DIR/packages/" | 
| 85 | 85 | 
| 86 exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$ANALYZER"
     "$SDK_ARG" "$@" | 86 exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$ANALYZER"
     "$SDK_ARG" "$@" | 
| OLD | NEW | 
|---|