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 2014/03/21 16:23:02 UTC
svn commit: r1579958 - in /manifoldcf/branches/CONNECTORS-912:
connectors/email/build.xml framework/buildfiles/connector-build.xml
Author: kwright
Date: Fri Mar 21 15:23:02 2014
New Revision: 1579958
URL: http://svn.apache.org/r1579958
Log:
First revamped connector build
Modified:
manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml
manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml?rev=1579958&r1=1579957&r2=1579958&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml Fri Mar 21 15:23:02 2014
@@ -17,6 +17,16 @@ limitations under the License.
<project name="email" default="all">
- <import file="../connector-build.xml"/>
+ <property environment="env"/>
+ <condition property="mcf-dst" value="${env.MCFDISTPATH}">
+ <isset property="env.MCFDISTPATH"/>
+ </condition>
+ <condition property="mcf-dist" value="../../dist">
+ <not>
+ <isset property="env.MCFDISTPATH"/>
+ </not>
+ </condition>
+
+ <import file="${mcf-dist}/connector-build.xml"/>
</project>
\ No newline at end of file
Modified: manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml?rev=1579958&r1=1579957&r2=1579958&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml Fri Mar 21 15:23:02 2014
@@ -32,6 +32,13 @@
<path id="mcf-connector-build.connector-classpath">
<fileset dir="${mcf-dist}/lib">
+ <include name="mcf-core.jar"/>
+ <include name="mcf-ui-core.jar"/>
+ <include name="mcf-agents.jar"/>
+ <include name="mcf-pull-agent.jar"/>
+ </fileset>
+ <fileset dir="${mcf-dist}/lib">
+ <include name="mail*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -71,12 +78,6 @@
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
</fileset>
- <fileset dir="${mcf-dist}/lib">
- <include name="mcf-core.jar"/>
- <include name="mcf-agents.jar"/>
- <include name="mcf-pullagent.jar"/>
- <include name="mcf-ui-core.jar"/>
- </fileset>
<pathelement location="build/stubclasses"/>
<pathelement location="build/wsdlclasses"/>
<pathelement location="build/xsdclasses"/>