Author: kwright
Date: Wed Mar 26 08:04:22 2014
New Revision: 1581732
URL: http://svn.apache.org/r1581732
Log:
Rearrange common-build
Added:
manifoldcf/branches/CONNECTORS-912/framework/buildfiles/common-build.xml
- copied unchanged from r1579604,
manifoldcf/branches/CONNECTORS-912/common-build.xml
Removed:
manifoldcf/branches/CONNECTORS-912/common-build.xml
Modified:
manifoldcf/branches/CONNECTORS-912/build.xml
manifoldcf/branches/CONNECTORS-912/framework/build.xml
manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-912/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/build.xml?rev=1581732&r1=1581731&r2=1581732&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/build.xml Wed Mar 26 08:04:22 2014
@@ -19,7 +19,7 @@
<import file="site-options.xml" optional="true"/>
- <import file="common-build.xml"/>
+ <import file="framework/buildfiles/common-build.xml"/>
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of
them here... -->
@@ -1206,6 +1206,7 @@
<copy todir="dist">
<fileset dir="framework/dist">
<include name="connector-build.xml"/>
+ <include name="common-build.xml"/>
</fileset>
</copy>
<mkdir dir="dist/web"/>
Modified: manifoldcf/branches/CONNECTORS-912/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/build.xml?rev=1581732&r1=1581731&r2=1581732&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/framework/build.xml Wed Mar 26 08:04:22
2014
@@ -17,6 +17,8 @@
<project default="all">
+ <import file="buildfiles/common-build.xml"/>
+
<target name="clean">
<delete dir="build"/>
<delete dir="dist"/>
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=1581732&r1=1581731&r2=1581732&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
Wed Mar 26 08:04:22 2014
@@ -17,7 +17,7 @@
<project name="mcf-connector-build">
- <import file="../common-build.xml"/>
+ <import file="common-build.xml"/>
<target name="clean">
<delete dir="build"/>
