languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-04 16:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove heap settings from pub scripts for SDK too.

Browse source 
r43821 only does it for the scripts used to run pub from within the source repo.

Also add support to the Windows shell script for passing VM flags to pub similar to
what dart2js and the bash pub scripts allow.

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

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

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@43925 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
rnystrom@google.com 2015-02-20 20:15:25 +00:00
parent 01126e0213
commit 25f3f6733d
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sdk/bin/pub.bat
View file

@ -23,6 +23,11 @@ IF %SDK_DIR:~-1%==\ set SDK_DIR=%SDK_DIR:~0,-1%
set VM_OPTIONS=
rem We allow extra vm options to be passed in through an environment variable.
if not "_%DART_VM_OPTIONS%_" == "__" (
set VM_OPTIONS=%VM_OPTIONS% %DART_VM_OPTIONS%
)
rem Use the Dart binary in the built SDK so pub can find the version file next
rem to it.
set BUILD_DIR=%SDK_DIR%\..\build\ReleaseIA32

4
sdk/bin/pub_sdk
View file

@ -26,10 +26,6 @@ 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"

8
sdk/bin/pub_sdk.bat
View file

@ -19,10 +19,10 @@ IF %SDK_DIR:~-1%==\ set SDK_DIR=%SDK_DIR:~0,-1%
set VM_OPTIONS=
rem Give the VM extra memory for dart2js.
rem # TODO(rnystrom): Remove when #8355 is fixed.
rem See comments regarding options below in dart2js shell script.
set VM_OPTIONS=%VM_OPTIONS% --old_gen_heap_size=1024
rem We allow extra vm options to be passed in through an environment variable.
if not "_%DART_VM_OPTIONS%_" == "__" (
set VM_OPTIONS=%VM_OPTIONS% %DART_VM_OPTIONS%
)
"%BIN_DIR%\dart" %VM_OPTIONS% "%BIN_DIR%\snapshots\pub.dart.snapshot" %*