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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
