You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/04/03 14:06:54 UTC
svn commit: r1308834 - /incubator/lcf/branches/CONNECTORS-443/build.xml
Author: kwright
Date: Tue Apr 3 12:06:54 2012
New Revision: 1308834
URL: http://svn.apache.org/viewvc?rev=1308834&view=rev
Log:
All dependencies are now maven, save jdbcpool-0.99
Modified:
incubator/lcf/branches/CONNECTORS-443/build.xml
Modified: incubator/lcf/branches/CONNECTORS-443/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/build.xml?rev=1308834&r1=1308833&r2=1308834&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/build.xml Tue Apr 3 12:06:54 2012
@@ -2434,7 +2434,18 @@
</zipfileset>
</zip>
</target>
-
+
+ <target name="create-lib-zip" depends="set-version">
+ <zip destfile="apache-manifoldcf-${release-version}-lib.zip" update="false">
+ <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
+ <include name="/lib/"/>
+ <include name="/connectors/*/lib/"/>
+ <include name="/framework/lib/"/>
+ <include name="*.txt"/>
+ </zipfileset>
+ </zip>
+ </target>
+
<target name="create-source-tar" depends="set-version">
<tar destfile="apache-manifoldcf-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
<tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
@@ -2469,6 +2480,17 @@
</tar>
</target>
+ <target name="create-lib-tar" depends="set-version">
+ <tar destfile="apache-manifoldcf-${release-version}-lib.tar.gz" compression="gzip" longfile="gnu">
+ <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
+ <include name="/lib/"/>
+ <include name="/connectors/*/lib/"/>
+ <include name="/framework/lib/"/>
+ <include name="*.txt"/>
+ </tarfileset>
+ </tar>
+ </target>
+
<target name="create-bin-zip" depends="build,doc,javadoc,set-version">
<zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
<zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
@@ -2544,7 +2566,7 @@
</tar>
</target>
- <target name="image" depends="create-source-zip,create-source-tar,create-bin-zip,create-bin-tar"/>
+ <target name="image" depends="create-source-zip,create-source-tar,create-lib-zip,create-lib-tar,create-bin-zip,create-bin-tar"/>
<target name="test-dr" depends="run-tests-derby-framework,run-tests-derby-open-connectors,run-tests-derby-lgpl-connectors,run-tests-derby-proprietary-connectors,end-to-end-tests-derby"/>
@@ -2954,29 +2976,25 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-jetty">
<mkdir dir="lib"/>
- <property name="jetty-version" value="6.1.26-patched-JETTY-1340"/>
+ <property name="jetty-version" value="6.1.26"/>
<property name="jetty-package" value="org/mortbay/jetty"/>
- <property name="jetty-description" value="jetty"/>
-
- <!-- Non-patched version has encoding issues -->
-
- <antcall target="download-via-svn"><param name="project-package" value="${jetty-package}"/><param name="project-desc" value="${jetty-description}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-svn"><param name="project-package" value="${jetty-package}"/><param name="project-desc" value="${jetty-description}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-naming"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-svn"><param name="project-package" value="${jetty-package}"/><param name="project-desc" value="${jetty-description}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-plus"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-svn"><param name="project-package" value="${jetty-package}"/><param name="project-desc" value="${jetty-description}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-util"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-svn"><param name="project-package" value="${jetty-package}"/><param name="project-desc" value="${jetty-description}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="project-path" value="${jetty-package}"/><param name="artifact-version" value="${jetty-version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jsp-2.1-jetty"/>
<param name="artifact-type" value="jar"/>
</antcall>