natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #557: Testing available memory before running SABBUS is now more robust. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6900 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2006-03-24 16:32:26 +00:00
parent c265edf804
commit 474cd02f0b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.xml
View File

@ -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"/>