fordfrog 15/02/24 21:06:23 Added: tomcat-8.0.20-build.xml.patch Log: www-servers/tomcat: version bump (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F)
Revision Changes Path 1.1 www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch?rev=1.1&content-type=text/plain Index: tomcat-8.0.20-build.xml.patch =================================================================== diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml --- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 +++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 @@ -703,24 +703,29 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> <!-- Servlet 3.1 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.3 Implementation JAR File --> +<!-- <jarIt jarfile="${jsp-api.jar}" filesDir="${tomcat.classes}" filesId="files.jsp-api" manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> +--> <!-- EL 3.0 Implementation JAR File --> +<!-- <jarIt jarfile="${el-api.jar}" filesDir="${tomcat.classes}" filesId="files.el-api" manifest="${tomcat.manifests}/el-api.jar.manifest" /> +--> <!-- WebSocket 1.1 API JAR File --> <jarIt jarfile="${websocket-api.jar}" @@ -992,14 +997,14 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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"> <fileset dir="bin"> @@ -1059,7 +1064,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> +<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> <!-- Add sources for examples --> <antcall target="examples-sources" /> @@ -1093,7 +1098,7 @@ </javac> </target> - <target name="build-tomcat-jdbc" depends="package"> + <target name="build-tomcat-jdbc" depends="package" unless="noget"> <!-- 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}" @@ -1108,7 +1113,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> - <target name="build-tomcat-jdbc-src"> + <target name="build-tomcat-jdbc-src" unless="noget"> <!-- build the jdbc-pool source jar--> <echo message="Building Tomcat JDBC pool src JAR"/> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" @@ -1212,10 +1217,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> +<!-- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" failonerror="false"/> <copy file="${jdt.jar}" todir="${tomcat.embed}" /> - +--> <!-- Note the meta-inf below will work as long as there is only one JAR that needs to add entries. If there is more than one a more complex solution will be required. --> @@ -1519,7 +1525,7 @@ <target name="extras-commons-logging-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-2"> <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> @@ -1658,7 +1664,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}"/> @@ -2703,7 +2709,7 @@ </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}"/> @@ -2746,7 +2752,7 @@ </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}"/> @@ -2792,7 +2798,7 @@ </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}"/> @@ -2818,18 +2824,18 @@ <!-- =============== Utility Targets to support downloads ================ --> - <target name="setproxy" if="${proxy.use}"> + <target name="setproxy" if="${proxy.use}" unless="noget"> <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> </target> - <target name="testexist"> + <target name="testexist" unless="noget"> <echo message="Testing for ${destfile}"/> <available file="${destfile}" property="exist"/> </target> - <target name="downloadgz" unless="exist" depends="testexist,setproxy"> + <target name="downloadgz" unless="noget" depends="testexist,setproxy"> <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2841,7 +2847,7 @@ <delete file="${temp.file}.tar.gz"/> </target> - <target name="downloadgz-2" unless="exist" depends="testexist"> + <target name="downloadgz-2" unless="noget" depends="testexist"> <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2860,7 +2866,7 @@ <delete file="${temp.file}.tar.gz"/> </target> - <target name="downloadzip" unless="exist" depends="testexist,setproxy"> + <target name="downloadzip" unless="noget" depends="testexist,setproxy"> <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2871,7 +2877,7 @@ <delete file="${temp.file}"/> </target> - <target name="downloadzip-2" unless="exist" depends="testexist"> + <target name="downloadzip-2" unless="noget" depends="testexist"> <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2889,7 +2895,7 @@ <delete file="${temp.file}"/> </target> - <target name="downloadfile" unless="exist" depends="testexist,setproxy"> + <target name="downloadfile" unless="noget" depends="testexist,setproxy"> <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2899,7 +2905,7 @@ <move file="${temp.file}" tofile="${destfile}"/> </target> - <target name="downloadfile-2" unless="exist" depends="testexist"> + <target name="downloadfile-2" unless="noget" depends="testexist"> <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> @@ -2922,7 +2928,7 @@ <move file="${temp.file}" tofile="${destfile}"/> </target> - <target name="trydownload.check" depends="setproxy"> + <target name="trydownload.check" depends="setproxy" unless="noget"> <condition property="trydownload.run"> <and> <not> @@ -2933,7 +2939,7 @@ </condition> </target> - <target name="trydownload" if="trydownload.run" depends="trydownload.check"> + <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> @@ -2944,7 +2950,7 @@ <target name="ide-eclipse" depends="download-compile, extras-webservices-prepare, download-test-compile" - description="Prepares the source tree to be built in Eclipse"> + description="Prepares the source tree to be built in Eclipse" unless="noget"> <!-- Copy the sample project files into the root directory --> <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
