---- apache-tomcat-7.0.8-src/build.xml.orig 2011-02-04 13:52:30.000000000 +0100
-+++ apache-tomcat-7.0.8-src/build.xml 2011-02-05 13:57:36.775158905 +0100
-@@ -421,51 +421,7 @@
+--- apache-tomcat-7.0.32-src/build.xml~ 2012-10-03 09:55:49.000000000 +0200
++++ apache-tomcat-7.0.32-src/build.xml 2012-11-09 11:22:30.324804340 +0100
+@@ -439,61 +439,6 @@
</target>
-- <target name="validate" depends="download-validate" if="${execute.validate}">
+- <target name="validate" if="${execute.validate}"
+- depends="build-prepare,compile-prepare,download-validate"
+- description="Uses Checkstyle tool to perform style check for the source code">
- <!-- Required so we can cache checkstyle results -->
- <mkdir dir="${tomcat.output}/res/checkstyle"/>
-
- <exclude name="res/checkstyle/header-al2.txt"/>
- <!-- Exclude auto-generated files -->
- <exclude name="java/org/apache/el/parser/ELParser*.java" />
-- <exclude name="java/org/apache/el/parser/JJTELParserState.java" />
- <exclude name="java/org/apache/el/parser/Node.java" />
-- <exclude name="java/org/apache/el/parser/ParseException.java" />
-- <exclude name="java/org/apache/el/parser/SimpleCharStream.java" />
-- <exclude name="java/org/apache/el/parser/Token*.java" />
+- <exclude name="java/org/apache/tomcat/util/http/parser/HttpParser*.java" />
+- <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
+- <exclude name="java/org/apache/**/parser/ParseException.java" />
+- <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
+- <exclude name="java/org/apache/**/parser/Token*.java" />
- <!-- Exclude these else Gump runs validate on them -->
- <exclude name="**/org/apache/tomcat/dbcp/**"/>
- <exclude name="**/tomcat-deps/**"/>
+- <!-- Exclude simple test files -->
+- <exclude name="test/webapp-3.0/bug53257/*.txt"/>
+- <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
+- </fileset>
+- <fileset dir="modules/jdbc-pool" >
+- <exclude name=".*/**"/>
+- <exclude name="**/MANIFEST.MF"/>
+- <patternset refid="text.files" />
- </fileset>
- </checkstyle>
- <!-- javax package checks -->
- </checkstyle>
- </target>
-
-- <target name="compile" depends="build-prepare,download-compile,validate">
-+ <target name="compile" depends="build-prepare">
+ <target name="validate-eoln" depends="build-prepare,compile-prepare"
+ description="Validate that the source files have correct line ends">
+
+@@ -498,7 +498,7 @@
+ </copy>
+ </target>
+- <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
++ <target name="compile" depends="build-prepare">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
-@@ -744,13 +703,6 @@
+ debug="${compile.debug}"
+@@ -836,13 +781,6 @@
<target name="deploy" depends="package,build-docs"
description="Default. Builds a working Tomcat instance">
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -1006,7 +958,7 @@
+@@ -1107,7 +1045,7 @@
</target>
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
-@@ -1103,52 +1055,10 @@
+@@ -1212,52 +1150,10 @@
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
<replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
-@@ -1170,7 +1080,8 @@
+@@ -1279,7 +1175,8 @@
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
<copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
<fileset file="${log4j.jar}" />
<fileset file="${logkit.jar}" />
<fileset file="${servletapi.jar}" />
-@@ -1250,18 +1161,6 @@
+@@ -1359,18 +1256,6 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1368,7 +1267,7 @@
+@@ -1477,7 +1362,7 @@
</target>
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -2092,301 +1991,7 @@
- description="Delete the default output folders">
- <delete dir="${tomcat.output}" />
+@@ -2268,290 +2153,6 @@
+ <delete file="webapps/docs/jdbc-pool.xml"/>
</target>
--
-
+
+-
- <!-- ================ Download and dependency building =================== -->
-
- <target name="download-validate"
- <param name="destfile" value="${commons-dbcp.home}/build.xml" />
- </antcall>
- <mkdir dir="${tomcat-dbcp.home}"/>
+- <!-- Rebuild dbcp only if built jars do not exist -->
+- <!-- or new versions of pool or dbcp have been downloaded. -->
- <condition property="no.build.dbcp">
- <and>
-- <available file="${tomcat-dbcp.jar}"/>
-- <available file="${tomcat-dbcp-src.jar}"/>
+- <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
+- <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
+- <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
+- <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
- </and>
- </condition>
- <antcall target="build-tomcat-dbcp" />
- <target name="download-dist"
- description="Download additional components for a distribution" >
-
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
-- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.dll.win32}"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
-- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.dll.x64}"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
-- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.dll.i64}"/>
+- <antcall target="downloadzip-2">
+- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
+- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
projects / packages / tomcat.git / blobdiff