summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2007-05-10 14:06:54 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2007-05-10 14:06:54 +0000
commitae0a3254e1b666bb7363c35fc80c8d489282d9e6 (patch)
treeda5f725305b8a7ef4eb3ec09cda42ab4646750ed /build.xml
parentfb248a8ec1bb829d706ad08ac73550513f867b68 (diff)
downloadscala-ae0a3254e1b666bb7363c35fc80c8d489282d9e6.tar.gz
scala-ae0a3254e1b666bb7363c35fc80c8d489282d9e6.tar.bz2
scala-ae0a3254e1b666bb7363c35fc80c8d489282d9e6.zip
[#1058] Sabbus warns the user when having less ...
[#1058] Sabbus warns the user when having less than 600MB of memory — which has Scaladoc thrashing during a dist.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index 9439602ffc..c9157e97c4 100644
--- a/build.xml
+++ b/build.xml
@@ -103,6 +103,10 @@ INITIALISATION
<fail
unless="memory.set"
message="SABBUS requires additional memory. Please set the 'ANT_OPTS' environment property to '-Xmx512M' or more."/>
+ <propertyregex
+ property="memory.info" input="${env.ANT_OPTS}" defaultValue=""
+ select=" (raise to 600 MB for performance)"
+ regexp="-Xmx([1-5][0-9]{2})(M|m)"/>
<!-- This is the start time for the distribution -->
<stopwatch name="timer.dist"/>
<tstamp prefix="time">
@@ -153,13 +157,13 @@ INITIALISATION
<property name="init.avail" value="yes"/>
<!-- Printing out some information about what environment I am running in -->
<echo level="info"
- message="OS: ${os.type} (${os.name} ${os.arch} ${os.version});"/>
+ message="OS: ${os.type} (${os.name} ${os.arch} ${os.version});"/>
<echo level="info"
- message="Java: ${java.version} ('${java.home}');"/>
+ message="Java: ${java.vm.name} ${java.vm.version} ('${java.home}');"/>
<echo level="info"
- message="JVM: ${java.vm.name} ${java.vm.version};"/>
+ message="Memory: ${memory.set} MB${memory.info};"/>
<echo level="info"
- message="Ant: ${ant.version}."/>
+ message="Ant: ${ant.version}."/>
</target>
<!-- ===========================================================================