| OLD | NEW | 
|---|
| 1 #!/bin/bash | 1 #!/bin/bash | 
| 2 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file | 2 # Copyright (c) 2012, 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 pub.dart on the Dart VM. This script assumes the Dart SDK's directory | 6 # Run pub.dart on the Dart VM. This script assumes the Dart SDK's directory | 
| 7 # structure. | 7 # structure. | 
| 8 | 8 | 
| 9 # Setting BIN_DIR this way is ugly, but is needed to handle the case where | 9 # Setting BIN_DIR this way is ugly, but is needed to handle the case where | 
| 10 # dart-sdk/bin has been symlinked to. On MacOS, readlink doesn't work | 10 # dart-sdk/bin has been symlinked to. On MacOS, readlink doesn't work | 
| 11 # with this case. | 11 # with this case. | 
| 12 BIN_DIR="$(cd "${0%/*}" ; pwd -P)" | 12 BIN_DIR="$(cd "${0%/*}" ; pwd -P)" | 
| 13 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" | 13 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" | 
| 14 | 14 | 
|  | 15 # Increase the heap size for Dart. Pub runs dart2js, which uses a lot of | 
|  | 16 # memory. | 
|  | 17 DART_FLAGS="--new_gen_heap_size=256 --old_gen_heap_size=1536" | 
|  | 18 | 
| 15 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" | 19 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" | 
| 16 | 20 | 
| 17 if test -f "$SNAPSHOT"; then | 21 if test -f "$SNAPSHOT"; then | 
| 18   # We are running the snapshot in the built SDK. | 22   # We are running the snapshot in the built SDK. | 
| 19   DART="$BIN_DIR/dart" | 23   DART="$BIN_DIR/dart" | 
| 20   exec "$DART" "$SNAPSHOT" "$@" | 24   exec "$DART" "$DART_FLAGS" "$SNAPSHOT" "$@" | 
| 21 else | 25 else | 
| 22   # We are running pub from source in the development repo. | 26   # We are running pub from source in the development repo. | 
| 23   if [ -z "$DART_CONFIGURATION" ]; | 27   if [ -z "$DART_CONFIGURATION" ]; | 
| 24   then | 28   then | 
| 25     DART_CONFIGURATION="ReleaseIA32" | 29     DART_CONFIGURATION="ReleaseIA32" | 
| 26   fi | 30   fi | 
| 27 | 31 | 
| 28   if [[ `uname` == 'Darwin' ]]; | 32   if [[ `uname` == 'Darwin' ]]; | 
| 29   then | 33   then | 
| 30     BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION" | 34     BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION" | 
| 31   else | 35   else | 
| 32     BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION" | 36     BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION" | 
| 33   fi | 37   fi | 
| 34 | 38 | 
| 35   # Use the Dart binary in the built SDK so pub can find the version file next | 39   # Use the Dart binary in the built SDK so pub can find the version file next | 
| 36   # to it. | 40   # to it. | 
| 37   DART="$BUILD_DIR/dart-sdk/bin/dart" | 41   DART="$BUILD_DIR/dart-sdk/bin/dart" | 
| 38   PACKAGES_DIR="$BUILD_DIR/packages/" | 42   PACKAGES_DIR="$BUILD_DIR/packages/" | 
| 39 | 43 | 
| 40   PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart" | 44   PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart" | 
| 41 | 45 | 
| 42   exec "$DART" "--package-root=$PACKAGES_DIR" "$PUB" "$@" | 46   exec "$DART" "$DART_FLAGS" "--package-root=$PACKAGES_DIR" "$PUB" "$@" | 
| 43 fi | 47 fi | 
| OLD | NEW | 
|---|