packages (DEVEL): tomcat/tomcat-build.xml.patch - disable all downloads - d...
pawelz
pawelz at pld-linux.org
Wed Jun 9 13:03:01 CEST 2010
Author: pawelz Date: Wed Jun 9 11:03:01 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- disable all downloads
- disable build of dependencies that should be built by other specs
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.2 -> 1.2.2.3)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.2 packages/tomcat/tomcat-build.xml.patch:1.2.2.3
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.2 Wed Jun 9 01:13:52 2010
+++ packages/tomcat/tomcat-build.xml.patch Wed Jun 9 13:02:53 2010
@@ -1,5 +1,5 @@
---- tomcat-7.0.0/build.xml.orig 2010-06-08 15:46:01.000000000 +0200
-+++ tomcat-7.0.0/build.xml 2010-06-09 00:01:40.000000000 +0200
+--- tomcat-7.0.0/build.xml.orig 2010-06-09 12:07:55.000000000 +0200
++++ tomcat-7.0.0/build.xml 2010-06-09 12:08:42.000000000 +0200
@@ -408,7 +408,7 @@
</target>
@@ -9,8 +9,6 @@
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
---- tomcat-7.0.0/build.xml~ 2010-06-09 00:15:23.000000000 +0200
-+++ tomcat-7.0.0/build.xml 2010-06-09 00:48:59.000000000 +0200
@@ -667,13 +667,6 @@
<target name="deploy" depends="package,build-docs"
description="Default. Builds a working Tomcat instance">
@@ -25,3 +23,290 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
+@@ -892,7 +885,7 @@
+ description="Creates the experimental embedded release"
+ depends="embed,embed-sources,embed-extras" />
+
+- <target name="test-compile" depends="compile,download-test-compile" >
++ <target name="test-compile" depends="compile" >
+ <mkdir dir="${test.classes}"/>
+ <!-- Compile -->
+ <javac srcdir="test" destdir="${test.classes}"
+@@ -954,16 +947,6 @@
+ depends="extras-prepare,compile,build-manifests"
+ description="Build JULI for log4j extras package">
+
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${commons-logging-src.loc}"/>
+- <param name="destfile" value="${tomcat.extras}/logging/commons-logging-src.tar.gz"/>
+- <param name="destdir" value="${tomcat.extras}/logging/"/>
+- </antcall>
+- <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
+- dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
+- <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
+- dest="${tomcat.extras}/logging/"/>
+-
+ <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"
+@@ -1064,18 +1047,6 @@
+ depends="extras-prepare,compile,build-manifests"
+ description="Build web services extras package">
+
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+- <param name="destfile" value="${jaxrpc-lib.jar}"/>
+- <param name="destdir" value="${jaxrpc-lib.home}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+- <param name="destfile" value="${wsdl4j-lib.jar}"/>
+- <param name="destdir" value="${wsdl4j-lib.home}"/>
+- </antcall>
+-
+ <copy file="${jaxrpc-lib.jar}"
+ tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+ <copy file="${wsdl4j-lib.jar}"
+@@ -1176,7 +1147,7 @@
+
+ </target>
+
+- <target name="dist-prepare" depends="download-dist">
++ <target name="dist-prepare">
+ <!-- This is why releasing must be done on Windows / with wine:
+ otherwise this check fails and the .exe distro is not generated -->
+ <condition property="execute.installer">
+@@ -1843,232 +1814,7 @@
+ description="Delete the default output folders">
+ <delete dir="${tomcat.output}" />
+ </target>
+-
+
+- <!-- ================ Download and dependency building =================== -->
+-
+- <target name="download-compile"
+- description="Download (and build) components necessary to compile" >
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${tomcat-native.loc}"/>
+- <param name="destfile" value="${tomcat-native.tar.gz}"/>
+- <param name="destdir" value="${tomcat-native.home}"/>
+- </antcall>
+-
+- <!-- Download Commons Daemon -->
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
+- <param name="destfile" value="${commons-daemon.jar}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
+- <param name="destdir" value="${commons-daemon.home}"/>
+- </antcall>
+-
+- <!-- Download src and build Tomcat DBCP bundle -->
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-pool-src.loc}"/>
+- <param name="destfile" value="${commons-pool.home}/build.xml" />
+- </antcall>
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+- <param name="destfile" value="${commons-dbcp.home}/build.xml" />
+- </antcall>
+- <mkdir dir="${tomcat-dbcp.home}"/>
+- <condition property="no.build.dbcp">
+- <and>
+- <available file="${tomcat-dbcp.jar}"/>
+- <available file="${tomcat-dbcp-src.jar}"/>
+- </and>
+- </condition>
+- <antcall target="build-tomcat-dbcp" />
+-
+- <!-- Download JDT (Eclipse compiler) -->
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${jdt.loc.1}"/>
+- <param name="sourcefile.2" value="${jdt.loc.2}"/>
+- <param name="destfile" value="${jdt.jar}"/>
+- <param name="destdir" value="${jdt.home}"/>
+- </antcall>
+- </target>
+-
+- <target name="download-test-compile"
+- description="Download additional components for the tests" >
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${junit.loc}"/>
+- <param name="destfile" value="${junit.jar}"/>
+- <param name="destdir" value="${base.path}"/>
+- </antcall>
+-
+- </target>
+-
+- <target name="download-dist"
+- description="Download additional components for a distribution" >
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.win32}"/>
+- <param name="destdir" value="${tomcat-native.home}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.x64}"/>
+- <param name="destdir" value="${tomcat-native.home}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.i64}"/>
+- <param name="destdir" value="${tomcat-native.home}"/>
+- </antcall>
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
+- <param name="destdir" value="${commons-daemon.native.win.home}"/>
+- </antcall>
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${nsis.loc}"/>
+- <param name="destfile" value="${nsis.exe}"/>
+- <param name="destdir" value="${nsis.home}/.."/>
+- </antcall>
+-
+- </target>
+-
+-
+- <!-- =============== Targets for dependencies that need to =============== -->
+- <!-- ================ be built rather than used directly ================ -->
+-
+- <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
+- <copy todir="${tomcat-dbcp.home}">
+- <fileset dir="${commons-pool.home}">
+- <include name="**/*.java" />
+- <exclude name="**/test/**" />
+- </fileset>
+- <fileset dir="${commons-dbcp.home}">
+- <include name="**/*.java" />
+- <exclude name="**/test/**" />
+- <exclude name="**/managed/**" />
+- </fileset>
+- </copy>
+- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+- encoding="ISO-8859-1">
+- <replacefilter token="org.apache.commons"
+- value="org.apache.tomcat.dbcp" />
+- </replace>
+- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+- encoding="ISO-8859-1">
+- <replacefilter token="enum"
+- value="enumeration" />
+- </replace>
+-
+- <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
+- <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
+- <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
+- </move>
+- <mkdir dir="${tomcat-dbcp.home}/classes"/>
+- <javac destdir="${tomcat-dbcp.home}/classes"
+- optimize="off"
+- debug="${compile.debug}"
+- deprecation="${compile.deprecation}"
+- source="${compile.source}"
+- target="${compile.target}"
+- sourcepath="${tomcat-dbcp.home}/src/java"
+- srcdir="${tomcat-dbcp.home}/src/java"
+- encoding="ISO-8859-1">
+- <include name="**" />
+- </javac>
+- <jarIt jarfile="${tomcat-dbcp.jar}"
+- filesDir="${tomcat-dbcp.home}/classes"
+- filesId="files.tomcat-dbcp" />
+- <jarIt jarfile="${tomcat-dbcp-src.jar}"
+- filesDir="${tomcat-dbcp.home}/src/java"
+- filesId="files.tomcat-dbcp" />
+- </target>
+-
+- <!-- =============== Utility Targets to support downloads ================ -->
+-
+- <target name="proxyflags">
+- <!-- check proxy parameters. -->
+- <condition property="useproxy">
+- <equals arg1="${proxy.use}" arg2="on" />
+- </condition>
+- </target>
+-
+- <target name="setproxy" depends="proxyflags" if="useproxy">
+- <taskdef name="setproxy"
+- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+- <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">
+- <echo message="Testing for ${destfile}"/>
+- <available file="${destfile}" property="exist"/>
+- </target>
+-
+- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+- <!-- Download and extract the package -->
+- <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+- <untar src="${base.path}/file.tar" dest="${base.path}"/>
+- <delete file="${base.path}/file.tar"/>
+- <delete file="${base.path}/file.tar.gz"/>
+- </target>
+-
+- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+- <!-- Download and extract the package -->
+- <get src="${sourcefile}" dest="${base.path}/file.zip" />
+- <mkdir dir="${destdir}" />
+- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
+- <delete file="${base.path}/file.zip"/>
+- </target>
+-
+- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+- <!-- Download extract the file -->
+- <mkdir dir="${destdir}" />
+- <get src="${sourcefile}" dest="${destfile}" />
+- </target>
+-
+- <target name="downloadfile-2" unless="exist" depends="testexist">
+- <!-- Download the file from the two alternative locations -->
+- <mkdir dir="${destdir}" />
+-
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.1}" />
+- </antcall>
+-
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.2}" />
+- </antcall>
+-
+- <available file="${destfile}" property="exist"/>
+- <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
+- </target>
+-
+- <target name="trydownload.check" depends="setproxy">
+- <condition property="trydownload.run">
+- <and>
+- <not>
+- <available file="${destfile}" />
+- </not>
+- <http url="${sourcefile}" />
+- </and>
+- </condition>
+- </target>
+-
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
+- <!-- Downloads a file if not yet downloaded and the source URL is available -->
+- <get src="${sourcefile}" dest="${destfile}" />
+- </target>
+-
+ <!-- ======================= Macros, Taskdefs etc ======================== -->
+
+ <macrodef name="jarIt" description="utility macro for standard JAR packaging">
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.2&r2=1.2.2.3&f=u
More information about the pld-cvs-commit
mailing list