diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-04 10:57:22 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-04 11:06:01 -0800 |
commit | 8e4cf271282e392c0ad0ea46217af6393a3f731a (patch) | |
tree | d2797f9932f34ad12a6ef342dbe4d33c149c39b6 | |
parent | 57f19c440a69714abf248ef7bbc5e94b96d89f2f (diff) | |
download | scala-8e4cf271282e392c0ad0ea46217af6393a3f731a.tar.gz scala-8e4cf271282e392c0ad0ea46217af6393a3f731a.tar.bz2 scala-8e4cf271282e392c0ad0ea46217af6393a3f731a.zip |
Updated bootstrap script.
-rwxr-xr-x | bootstrapper.sh | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/bootstrapper.sh b/bootstrapper.sh index b056e70470..1460c1e1f7 100755 --- a/bootstrapper.sh +++ b/bootstrapper.sh @@ -17,18 +17,24 @@ EOM locker=build/locker/classes/library quick=build/quick/classes/library -run pull-binary-libs.sh -run rm -rf ./build -run mkdir -p $locker -for f in $troubleFiles; do - run ./tools/starr_scalac -d $locker $f -done - -run env ANT_OPTS="-Xmx2g -Xms2g" ant "$@" locker.done -run mkdir -p $quick - -for f in $troubleFiles; do - run ./tools/locker_scalac -d $quick $f -done +doLocker () { + run pull-binary-libs.sh + [[ -d $locker ]] || run mkdir -p $locker + for f in $troubleFiles; do + run ./tools/starr_scalac -d $locker $f + done + run env ANT_OPTS="-Xmx2g -Xms2g" ant "$@" locker.done +} +doQuick () { + [[ -d $quick ]] || run mkdir -p $quick + for f in $troubleFiles; do + run ./tools/locker_scalac -d $quick $f + done + run env ANT_OPTS="-Xmx2g -Xms2g" ant "$@" build +} -run env ANT_OPTS="-Xmx2g -Xms2g" ant "$@" build +case $1 in + all.clean) run ant all.clean && shift && doLocker "$@" && doQuick "$@" ;; + clean) run ant clean && shift && doQuick "$@" ;; + *) echo "Freshening only: to all.clean or clean before build, give all.clean or clean as first arg" && doQuick "$@" ;; +esac |