Return-Path: 
 <dev-return-108085-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 706 invoked from network); 24 Jul 2010 08:38:46 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 24 Jul 2010 08:38:46 -0000
Received: (qmail 45660 invoked by uid 500); 24 Jul 2010 08:38:46 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 44971 invoked by uid 500); 24 Jul 2010 08:38:43 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 44962 invoked by uid 99); 24 Jul 2010 08:38:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 08:38:41 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 08:38:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CC1D523889B3; Sat, 24 Jul 2010 08:37:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r978826 - in /tomcat/trunk: BUILDING.txt
 build.properties.default build.xml
Date: Sat, 24 Jul 2010 08:37:48 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100724083748.CC1D523889B3@eris.apache.org>

Author: markt
Date: Sat Jul 24 08:37:48 2010
New Revision: 978826

URL: http://svn.apache.org/viewvc?rev=978826&view=rev
Log:
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.

Modified:
    tomcat/trunk/BUILDING.txt
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=978826&r1=978825&r2=978826&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sat Jul 24 08:37:48 2010
@@ -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
 

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=978826&r1=978825&r2=978826&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat Jul 24 08:37:48 2010
@@ -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

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=978826&r1=978825&r2=978826&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Jul 24 08:37:48 2010
@@ -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
            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}"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org