| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2014, 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 function follow_links() { | 9 function follow_links() { |
| 10 file="$1" | 10 file="$1" |
| 11 while [ -h "$file" ]; do | 11 while [ -h "$file" ]; do |
| 12 # On Mac OS, readlink -f doesn't work. | 12 # On Mac OS, readlink -f doesn't work. |
| 13 file="$(readlink "$file")" | 13 file="$(readlink "$file")" |
| 14 done | 14 done |
| 15 echo "$file" | 15 echo "$file" |
| 16 } | 16 } |
| 17 | 17 |
| 18 # Unlike $0, $BASH_SOURCE points to the absolute path of this file. | 18 # Unlike $0, $BASH_SOURCE points to the absolute path of this file. |
| 19 PROG_NAME="$(follow_links "$BASH_SOURCE")" | 19 PROG_NAME="$(follow_links "$BASH_SOURCE")" |
| 20 | 20 |
| 21 # Handle the case where dart-sdk/bin has been symlinked to. | 21 # Handle the case where dart-sdk/bin has been symlinked to. |
| 22 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" | 22 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" |
| 23 | 23 |
| 24 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" | |
| 25 | |
| 26 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" | 24 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" |
| 27 | 25 |
| 28 unset VM_OPTIONS | 26 unset VM_OPTIONS |
| 29 declare -a VM_OPTIONS | 27 declare -a VM_OPTIONS |
| 30 | 28 |
| 31 # Give the VM extra memory for dart2js. | 29 # Give the VM extra memory for dart2js. |
| 32 # TODO(rnystrom): Remove when #8355 is fixed. | 30 # TODO(rnystrom): Remove when #8355 is fixed. |
| 33 VM_OPTIONS+=("--old_gen_heap_size=1024") | 31 VM_OPTIONS+=("--old_gen_heap_size=1024") |
| 34 | 32 |
| 35 # Allow extra VM options to be passed in through an environment variable. | 33 # Allow extra VM options to be passed in through an environment variable. |
| 36 if [[ $DART_VM_OPTIONS ]]; then | 34 if [[ $DART_VM_OPTIONS ]]; then |
| 37 read -a OPTIONS <<< "$DART_VM_OPTIONS" | 35 read -a OPTIONS <<< "$DART_VM_OPTIONS" |
| 38 VM_OPTIONS+=("${OPTIONS[@]}") | 36 VM_OPTIONS+=("${OPTIONS[@]}") |
| 39 fi | 37 fi |
| 40 | 38 |
| 41 VM_OPTIONS+=("--checked") | 39 # Run the pub snapshot. |
| 42 | 40 DART="$BIN_DIR/dart" |
| 43 if test -f "$SNAPSHOT"; then | 41 exec "$DART" "${VM_OPTIONS[@]}" "$SNAPSHOT" "$@" |
| 44 # We are running the snapshot in the built SDK. | |
| 45 DART="$BIN_DIR/dart" | |
| 46 exec "$DART" "${VM_OPTIONS[@]}" "$SNAPSHOT" "$@" | |
| 47 else | |
| 48 # We are running pub from source in the development repo. | |
| 49 if [ -z "$DART_CONFIGURATION" ]; | |
| 50 then | |
| 51 DART_CONFIGURATION="ReleaseIA32" | |
| 52 fi | |
| 53 | |
| 54 if [[ `uname` == 'Darwin' ]]; | |
| 55 then | |
| 56 BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION" | |
| 57 else | |
| 58 BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION" | |
| 59 fi | |
| 60 | |
| 61 # Use the Dart binary in the built SDK so pub can find the version file next | |
| 62 # to it. | |
| 63 DART="$BUILD_DIR/dart-sdk/bin/dart" | |
| 64 PACKAGES_DIR="$BUILD_DIR/packages/" | |
| 65 | |
| 66 PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart" | |
| 67 | |
| 68 exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@" | |
| 69 fi | |
| OLD | NEW |