Author: kkolinko
Date: Sat Feb 18 02:40:11 2012
New Revision: 1245849
URL: http://svn.apache.org/viewvc?rev=1245849&view=rev
Log:
Simplify validate-eoln target so that it is independent of the compile target
and can be run before compilation.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1245849&r1=1245848&r2=1245849&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Feb 18 02:40:11 2012
@@ -482,8 +482,28 @@
</checkstyle>
</target>
- <target name="validate-eoln" depends="compile"
+ <target name="validate-eoln" depends="build-prepare,compile-prepare"
description="Validate that the source files have correct line ends">
+
+ <!-- Compile the CheckEol class only. Note that the class depends on
+ Ant only. There is no need to download additional dependencies nor
+ add them to the class path. The rest should be the same as in "compile"
+ target.-->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
+ optimize="${compile.optimize}"
+ excludes="**/.svn/**"
+ encoding="ISO-8859-1"
+ includeAntRuntime="true" >
+ <!-- Uncomment this to show unchecked warnings:
+ <compilerarg value="-Xlint:unchecked"/>
+ -->
+ <include name="org/apache/tomcat/buildutil/CheckEol*" />
+ </javac>
+
<taskdef name="checkeol"
classname="org.apache.tomcat.buildutil.CheckEol"
classpath="${tomcat.classes}" />
@@ -532,7 +552,7 @@
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
- <!-- Comment this in to show unchecked warnings:
+ <!-- Uncomment this to show unchecked warnings:
<compilerarg value="-Xlint:unchecked"/>
-->
<classpath refid="compile.classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
