From e7bd2c9fe58e4d6bebc529614bd0ec11031d21d5 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 28 Aug 2009 02:23:48 +0000
Subject: Put a default for ANT_OPTS in build.xml.

---
 build.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index e431ed7002..1a309c6f05 100644
--- a/build.xml
+++ b/build.xml
@@ -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 -->
-- 
cgit v1.2.3