107 lines
3.9 KiB
Diff
107 lines
3.9 KiB
Diff
diff --git a/apache-tomcat-7.0.59-src/build.xml b/apache-tomcat-7.0.59-src/build.xml
|
|
index 9c4cb10..5067f44 100644
|
|
--- a/apache-tomcat-7.0.59-src/build.xml
|
|
+++ b/apache-tomcat-7.0.59-src/build.xml
|
|
@@ -701,26 +701,32 @@
|
|
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
|
|
|
|
<!-- Servlet 3.0 Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${servlet-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.servlet-api"
|
|
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
|
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
|
license="${tomcat.manifests}/servlet-api.jar.license" />
|
|
+-->
|
|
|
|
<!-- JSP 2.2 Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${jsp-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.jsp-api"
|
|
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
|
|
notice="${tomcat.manifests}/jsp-api.jar.notice"
|
|
license="${tomcat.manifests}/jsp-api.jar.license" />
|
|
+-->
|
|
|
|
<!-- JSP 2.2 EL Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${el-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.el-api"
|
|
manifest="${tomcat.manifests}/el-api.jar.manifest" />
|
|
+-->
|
|
|
|
<!-- Bootstrap JAR File -->
|
|
<jarIt jarfile="${bootstrap.jar}"
|
|
@@ -966,12 +972,14 @@
|
|
<target name="deploy" depends="package,build-docs,compile-webapp-examples"
|
|
description="Default. Builds a working Tomcat instance">
|
|
|
|
+<!--
|
|
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
|
|
file="${tomcat-native.tar.gz}" />
|
|
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
|
|
file="${commons-daemon.native.src.tgz}" />
|
|
|
|
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
|
|
+-->
|
|
|
|
<!-- Copy scripts -->
|
|
<copy todir="${tomcat.build}/bin">
|
|
@@ -1031,14 +1039,15 @@
|
|
<exclude name="${jdt.jar.filename}"/>
|
|
</fileset>
|
|
</delete>
|
|
+<!--
|
|
<copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
|
|
-
|
|
+-->
|
|
<!-- Add sources for examples -->
|
|
<antcall target="examples-sources" />
|
|
-
|
|
+<!--
|
|
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
|
|
failonerror="false"/>
|
|
-
|
|
+-->
|
|
<!-- build the jdbc-pool jar and source jar-->
|
|
<echo message="Building Tomcat JDBC pool libraries"/>
|
|
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
|
|
@@ -1630,7 +1639,7 @@
|
|
|
|
<target name="extras-webservices-prepare"
|
|
depends="extras-prepare"
|
|
- description="Prepare to build web services extras package">
|
|
+ description="Prepare to build web services extras package" unless="noget">
|
|
|
|
<antcall target="downloadfile">
|
|
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
|
|
@@ -2591,7 +2600,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
</target>
|
|
|
|
<target name="download-compile"
|
|
- description="Download (and build) components necessary to compile" >
|
|
+ description="Download (and build) components necessary to compile" unless="noget">
|
|
|
|
<antcall target="downloadfile-2">
|
|
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|
|
@@ -2648,7 +2657,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
</target>
|
|
|
|
<target name="download-test-compile"
|
|
- description="Download additional components for the tests" >
|
|
+ description="Download additional components for the tests" unless="noget">
|
|
|
|
<antcall target="downloadfile">
|
|
<param name="sourcefile" value="${junit.loc}"/>
|
|
@@ -2676,7 +2685,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
</target>
|
|
|
|
<target name="download-dist"
|
|
- description="Download additional components for a distribution" >
|
|
+ description="Download additional components for a distribution" unless="noget">
|
|
|
|
<antcall target="downloadzip-2">
|
|
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
|