| 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 is only used when running pub from | 6 # Run pub.dart on the Dart VM. This script is only used when running pub from |
| 7 # within the Dart source repo. The shipped SDK instead uses "pub_sdk", which is | 7 # within the Dart source repo. The shipped SDK instead uses "pub_sdk", which is |
| 8 # renamed to "pub" when the SDK is built. | 8 # renamed to "pub" when the SDK is built. |
| 9 | 9 |
| 10 function follow_links() { | 10 function follow_links() { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 # Handle the case where dart-sdk/bin has been symlinked to. | 22 # Handle the case where dart-sdk/bin has been symlinked to. |
| 23 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" | 23 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" |
| 24 | 24 |
| 25 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" | 25 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" |
| 26 | 26 |
| 27 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" | 27 SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot" |
| 28 | 28 |
| 29 unset VM_OPTIONS | 29 unset VM_OPTIONS |
| 30 declare -a VM_OPTIONS | 30 declare -a VM_OPTIONS |
| 31 | 31 |
| 32 # Give the VM extra memory for dart2js. | |
| 33 # TODO(rnystrom): Remove when #8355 is fixed. | |
| 34 VM_OPTIONS+=("--old_gen_heap_size=1024") | |
| 35 | |
| 36 # Allow extra VM options to be passed in through an environment variable. | 32 # Allow extra VM options to be passed in through an environment variable. |
| 37 if [[ $DART_VM_OPTIONS ]]; then | 33 if [[ $DART_VM_OPTIONS ]]; then |
| 38 read -a OPTIONS <<< "$DART_VM_OPTIONS" | 34 read -a OPTIONS <<< "$DART_VM_OPTIONS" |
| 39 VM_OPTIONS+=("${OPTIONS[@]}") | 35 VM_OPTIONS+=("${OPTIONS[@]}") |
| 40 fi | 36 fi |
| 41 | 37 |
| 42 if [ -z "$DART_CONFIGURATION" ]; | 38 if [ -z "$DART_CONFIGURATION" ]; |
| 43 then | 39 then |
| 44 DART_CONFIGURATION="ReleaseIA32" | 40 DART_CONFIGURATION="ReleaseIA32" |
| 45 fi | 41 fi |
| 46 | 42 |
| 47 if [[ `uname` == 'Darwin' ]]; | 43 if [[ `uname` == 'Darwin' ]]; |
| 48 then | 44 then |
| 49 BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION" | 45 BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION" |
| 50 else | 46 else |
| 51 BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION" | 47 BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION" |
| 52 fi | 48 fi |
| 53 | 49 |
| 54 # Use the Dart binary in the built SDK so pub can find the version file next | 50 # Use the Dart binary in the built SDK so pub can find the version file next |
| 55 # to it. | 51 # to it. |
| 56 DART="$BUILD_DIR/dart-sdk/bin/dart" | 52 DART="$BUILD_DIR/dart-sdk/bin/dart" |
| 57 PACKAGES_DIR="$BUILD_DIR/packages/" | 53 PACKAGES_DIR="$BUILD_DIR/packages/" |
| 58 | 54 |
| 59 # Run the async/await compiled pub. | 55 # Run the async/await compiled pub. |
| 60 PUB="$SDK_DIR/lib/_internal/pub_generated/bin/pub.dart" | 56 PUB="$SDK_DIR/lib/_internal/pub_generated/bin/pub.dart" |
| 61 exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@" | 57 exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@" |
| OLD | NEW |