From acaaea7ab62072207cf903f4440807e4a0a0022a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 24 Jul 2010 08:37:48 +0000
Subject: [PATCH] Update to require Ant 1.8.x+ to take advantage of the new
 property expansion for if/unless and then use it control if the validate code
 is executed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@978826 13f79535-47bb-0310-9956-ffa450edef68
---
 BUILDING.txt             |  6 +++---
 build.properties.default |  3 +++
 build.xml                | 17 +++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index b842ff58f..d5989c685 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -42,11 +42,11 @@ do the following:
   into which you installed the JDK release.
 
 
-(1) Install Apache Ant 1.6.x on your computer
+(1) Install Apache Ant 1.8.x on your computer
 
-* If Apache Ant 1.6.x is already installed on your computer, skip to (2).
+* If Apache Ant 1.8.x is already installed on your computer, skip to (2).
 
-* Download a binary distribution of Ant 1.6.x from:
+* Download a binary distribution of Ant 1.8.x from:
 
     http://ant.apache.org/bindownload.cgi
 
diff --git a/build.properties.default b/build.properties.default
index cbfc32db3..ff0568c38 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,6 +31,9 @@ version.build=1
 version.patch=0
 version.suffix=-dev
 
+# ----- Build control flags -----
+execute.validate=false
+
 # ----- Default Base Path for Dependent Packages -----
 # Please note this path must be absolute, not relative,
 # as it is referenced with different working directory
diff --git a/build.xml b/build.xml
index a237b17e6..30e4c4c59 100644
--- a/build.xml
+++ b/build.xml
@@ -410,7 +410,7 @@
   	
   </target>
 
-  <target name="validate" depends="download-validate">
+  <target name="validate" depends="download-validate" if="${execute.validate}">
     <taskdef resource="checkstyletask.properties"
   	         classpath="${checkstyle.jar}" />
   	<checkstyle config="checkstyle.xml">
@@ -763,7 +763,8 @@
              optimize="${compile.optimize}"
              classpath="${tomcat.classes}"
              excludes="**/CVS/**,**/.svn/**"
-             encoding="ISO-8859-1">
+             encoding="ISO-8859-1"
+    	     includeantruntime="false">
     </javac>
 
     <javac   srcdir="webapps/examples/jsp/plugin/applet"
@@ -774,7 +775,8 @@
              optimize="${compile.optimize}"
              classpath="$tomcat.lcasses}"
              excludes="**/CVS/**,**/.svn/**"
-             encoding="ISO-8859-1">
+             encoding="ISO-8859-1"
+    	     includeantruntime="false">
     </javac>
 
     <!-- Add sources for examples -->
@@ -931,7 +933,8 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            optimize="${compile.optimize}"
-           encoding="ISO-8859-1">
+           encoding="ISO-8859-1"
+    	   includeantruntime="false">
       <classpath refid="tomcat.test.classpath" />
       <include name="org/apache/**" />
       <include name="javax/servlet/**" />
@@ -1151,7 +1154,8 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            optimize="${compile.optimize}"
-           encoding="ISO-8859-1">
+           encoding="ISO-8859-1"
+    	   includeantruntime="false">
       <classpath refid="tomcat.webservices.classpath" />
       <include name="org/apache/naming/factory/webservices/**" />
     </javac>
@@ -2044,7 +2048,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
            target="${compile.target}"
            sourcepath="${tomcat-dbcp.home}/src/java"
            srcdir="${tomcat-dbcp.home}/src/java"
-           encoding="ISO-8859-1">
+           encoding="ISO-8859-1"
+    	   includeantruntime="false">
       <include name="**" />
     </javac>
   	<jarIt jarfile="${tomcat-dbcp.jar}"
-- 
2.11.0