diff options
| author | Paul Phillips <paulp@improving.org> | 2009-08-28 02:23:48 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-08-28 02:23:48 +0000 |
| commit | e7bd2c9fe58e4d6bebc529614bd0ec11031d21d5 (patch) | |
| tree | 31e21dfb30578c3f87a1cd7f16b02b40aa31afe1 /build.xml | |
| parent | d19685e7a52bd421934cfe389886f1a1cc938df1 (diff) | |
| download | scala-e7bd2c9fe58e4d6bebc529614bd0ec11031d21d5.tar.gz scala-e7bd2c9fe58e4d6bebc529614bd0ec11031d21d5.tar.bz2 scala-e7bd2c9fe58e4d6bebc529614bd0ec11031d21d5.zip | |
Put a default for ANT_OPTS in build.xml.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -100,6 +100,9 @@ PROPERTIES ============================================================================ --> <property environment="env"/> + <!-- if ANT_OPTS is already set by the environment, it will be unaltered, + but if it is unset it will take this default value. --> + <property name="env.ANT_OPTS" value="-Xms512M -Xmx1024M -Xss1M -XX:MaxPermSize=128M" /> <!-- Prevents system classpath from being used --> <property name="build.sysclasspath" value="ignore"/> @@ -154,12 +157,6 @@ INITIALISATION ============================================================================ --> <target name="init"> - <fail message="You need to set the ANT_OPTS environment variable to something like '-Xms512M -Xmx1024M -Xss1M -XX:MaxPermSize=128M'"> - <condition><or> - <not><isset property="env.ANT_OPTS"/></not> - <equals arg1="${env.ANT_OPTS}" arg2=""/> - </or></condition> - </fail> <!-- Setting-up Ant contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> <!-- This is the start time for the distribution --> |