Give the VM more heap in pub (on Mac/Linux).

BUG=https://code.google.com/p/dart/issues/detail?id=14730
R=ahe@google.com, nweiz@google.com

Review URL: https://codereview.chromium.org//168013003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@32803 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
rnystrom@google.com 2014-02-19 18:36:12 +00:00
parent ef49163d6a
commit 13ae4b64cb
2 changed files with 32 additions and 4 deletions

View file

@ -25,10 +25,23 @@ SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot"
unset VM_OPTIONS
declare -a VM_OPTIONS
# Give the VM extra memory for dart2js.
# TODO(rnystrom): Remove when #8355 is fixed.
VM_OPTIONS+=("--old_gen_heap_size=1024")
# Allow extra VM options to be passed in through an environment variable.
if [[ $DART_VM_OPTIONS ]]; then
read -a OPTIONS <<< "$DART_VM_OPTIONS"
VM_OPTIONS+=("${OPTIONS[@]}")
fi
if test -f "$SNAPSHOT"; then
# We are running the snapshot in the built SDK.
DART="$BIN_DIR/dart"
exec "$DART" "$SNAPSHOT" "$@"
exec "$DART" "${VM_OPTIONS[@]}" "$SNAPSHOT" "$@"
else
# We are running pub from source in the development repo.
if [ -z "$DART_CONFIGURATION" ];
@ -50,5 +63,5 @@ else
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
exec "$DART" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
fi

View file

@ -25,10 +25,25 @@ SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot"
unset VM_OPTIONS
declare -a VM_OPTIONS
# Give the VM extra memory for dart2js.
# TODO(rnystrom): Remove when #8355 is fixed.
VM_OPTIONS+=("--old_gen_heap_size=1024")
# Allow extra VM options to be passed in through an environment variable.
if [[ $DART_VM_OPTIONS ]]; then
read -a OPTIONS <<< "$DART_VM_OPTIONS"
VM_OPTIONS+=("${OPTIONS[@]}")
fi
VM_OPTIONS+=("--checked")
if test -f "$SNAPSHOT"; then
# We are running the snapshot in the built SDK.
DART="$BIN_DIR/dart"
exec "$DART" --checked "$SNAPSHOT" "$@"
exec "$DART" "${VM_OPTIONS[@]}" "$SNAPSHOT" "$@"
else
# We are running pub from source in the development repo.
if [ -z "$DART_CONFIGURATION" ];
@ -50,5 +65,5 @@ else
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
exec "$DART" "--checked" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
fi