diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2006-03-24 16:32:26 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2006-03-24 16:32:26 +0000 |
| commit | c7e98a8e003ee900db191112efd7bc81363c9ad3 (patch) | |
| tree | 765430528532d26f4fb9c34ccc9dbfdafcacf068 /build.xml | |
| parent | ce7646c79bdf56d936193d10b754e51fbb33a992 (diff) | |
| download | scala-c7e98a8e003ee900db191112efd7bc81363c9ad3.tar.gz scala-c7e98a8e003ee900db191112efd7bc81363c9ad3.tar.bz2 scala-c7e98a8e003ee900db191112efd7bc81363c9ad3.zip | |
Fixed bug #557: Testing available memory before...
Fixed bug #557: Testing available memory before running SABBUS is now
more robust.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -15,13 +15,6 @@ PROPERTIES ============================================================================ --> <property environment="env"/> - <condition property="memory.set"> - <contains string="${env.ANT_OPTS}" substring="-Xmx"/> - </condition> - <fail unless="memory.set"> - SABBUS requires additional memory. Please set the 'ANT_OPTS' environment - property to '-Xmx512M' or more. - </fail> <!-- Prevents system classpath from being used --> <property name="build.sysclasspath" value="ignore"/> @@ -182,6 +175,17 @@ INITIALISATION <pathelement location="${ant-contrib.jar}"/> </classpath> </taskdef> + <!-- Making sure enough memory is available --> + <propertyregex + property="memory.set" + input="${env.ANT_OPTS}" + regexp="-Xmx([1-9][0-9]{3,}|[6-9][0-9]{2}|5[2-9][0-9]|51[2-9])(M|m)" + select="\1" + /> + <fail unless="memory.set"> + SABBUS requires additional memory. Please set the 'ANT_OPTS' environment + property to '-Xmx512M' or more. + </fail> <!-- Finding out what system architecture is being used --> <condition property="os.win"> <os family="windows"/> |