Author: kwright
Date: Thu Feb 20 08:48:15 2014
New Revision: 1570110
URL: http://svn.apache.org/r1570110
Log:
Fix for CONNECTORS-896.
Modified:
manifoldcf/integration/solr-3.x/trunk/ (props changed)
manifoldcf/integration/solr-3.x/trunk/DEPENDENCIES.txt
manifoldcf/integration/solr-3.x/trunk/build.xml
Propchange: manifoldcf/integration/solr-3.x/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 20 08:48:15 2014
@@ -2,4 +2,5 @@ build
dist
apache-manifoldcf-solr-3.x-plugin-*
solr
+download
apache-manifoldcf-solr-3.x-plugin-*
Propchange: manifoldcf/integration/solr-3.x/trunk/
------------------------------------------------------------------------------
--- svn:ignores (original)
+++ svn:ignores Thu Feb 20 08:48:15 2014
@@ -1,3 +1,5 @@
apache-manifoldcf-solr-3.x-plugin-0.1-incubating-dev-src.zip
solr
+dist
+download
apache-manifoldcf-solr-3.x-plugin-0.1-incubating-dev-src.tar.gz
Modified: manifoldcf/integration/solr-3.x/trunk/DEPENDENCIES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/DEPENDENCIES.txt?rev=1570110&r1=1570109&r2=1570110&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/DEPENDENCIES.txt (original)
+++ manifoldcf/integration/solr-3.x/trunk/DEPENDENCIES.txt Thu Feb 20 08:48:15
2014
@@ -1,7 +1,6 @@
Apache ManifoldCF Plugin for Apache Solr 3.x requires
---------------------------------------------------
* JRE 1.6 or above
-* svn command line tools
* ant 1.8 or higher
* ivy 2.2 or higher
Modified: manifoldcf/integration/solr-3.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/trunk/build.xml?rev=1570110&r1=1570109&r2=1570110&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/trunk/build.xml (original)
+++ manifoldcf/integration/solr-3.x/trunk/build.xml Thu Feb 20 08:48:15 2014
@@ -26,15 +26,39 @@
</target>
<target name="download-solr">
- <mkdir dir="solr" />
- <exec dir="solr" executable="svn" failifexecutionfails="true"
failonerror="true">
- <arg value="checkout" />
- <arg
value="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_2/"; />
- <arg value="." />
- </exec>
+ <mkdir dir="download" />
+ <!-- Download and unpack binary artifact -->
+ <get
src="http://archive.apache.org/dist/lucene/solr/3.6.2/apache-solr-3.6.2-src.tgz";
dest="download/solr.tgz"/>
+ <untar src="download/solr.tgz" dest="download/solr" compression="gzip"/>
</target>
- <target name="copy-sources" depends="download-solr">
+ <target name="make-deps" depends="download-solr">
+ </target>
+
+ <target name="clean-deps">
+ <delete dir="download"/>
+ </target>
+
+ <target name="downloaded-condition">
+ <available file="download/solr/apache-solr-3.6.2/README.txt"
property="CHANGES-found"/>
+ <condition property="downloaded">
+ <and>
+ <isset property="CHANGES-found"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="downloaded-check" depends="downloaded-condition"
unless="downloaded">
+ <echo message="Run 'make-deps' target first"/>
+ </target>
+
+ <target name="copy-solr" depends="downloaded-check" if="downloaded">
+ <copy todir="solr">
+ <fileset dir="download/solr/apache-solr-3.6.2"/>
+ </copy>
+ </target>
+
+ <target name="copy-sources" depends="copy-solr" if="downloaded">
<mkdir dir="solr/solr/contrib/mcf"/>
<copy todir="solr/solr/contrib/mcf">
<fileset dir="mcf">
@@ -43,15 +67,15 @@
</copy>
</target>
- <target name="compile" depends="copy-sources">
+ <target name="compile" depends="copy-sources" if="downloaded">
<ant dir="solr/solr/contrib/mcf" target="default"/>
</target>
- <target name="test" depends="copy-sources">
+ <target name="test" depends="copy-sources" if="downloaded">
<ant dir="solr/solr/contrib/mcf" target="test"/>
</target>
- <target name="deliver" depends="compile">
+ <target name="deliver" depends="compile" if="downloaded">
<mkdir dir="dist"/>
<copy todir="dist">
<fileset dir="solr/solr/build/contrib/solr-mcf">
@@ -66,7 +90,7 @@
</copy>
</target>
- <target name="build" depends="deliver"/>
+ <target name="build" depends="deliver" if="downloaded"/>
<target name="set-version">
<property name="release-version" value="1.2-dev"/>
@@ -92,21 +116,21 @@
</tar>
</target>
- <target name="create-bin-zip" depends="build,set-version">
+ <target name="create-bin-zip" depends="build,set-version" if="downloaded">
<zip
destfile="apache-manifoldcf-solr-3.x-plugin-${release-version}-bin.zip"
update="false">
<zipfileset dir="dist"
prefix="apache-manifoldcf-solr-3.x-plugin-${release-version}">
</zipfileset>
</zip>
</target>
- <target name="create-bin-tar" depends="build,set-version">
+ <target name="create-bin-tar" depends="build,set-version" if="downloaded">
<tar
destfile="apache-manifoldcf-solr-3.x-plugin-${release-version}-bin.tar.gz"
compression="gzip" longfile="gnu">
<tarfileset dir="dist"
prefix="apache-manifoldcf-solr-3.x-plugin-${release-version}">
</tarfileset>
</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-bin-zip,create-bin-tar"
if="downloaded"/>
<target name="help">
<echo level="info">
@@ -115,14 +139,15 @@ build the plugin distributables and run
Useful targets are:
-clean - Clean the build area
-build - Build jar under the 'dist' directory
-test - Run the tests
-image - Package the sources and binaries
-
-Prerequisites: This build requires Subversion (svn) to be
-installed, and svn internet access to the Apache repository.
-It also requires Java jdk1.6.0 or above.
+clean-deps - Clean dependencies
+make-deps - Download dependencies
+clean - Clean the build area
+build - Build jar under the 'dist' directory
+test - Run the tests
+image - Package the sources and binaries
+
+Prerequisites: This build Java jdk1.6.0 or above,
+and Apache Ivy 2.2 or above.
</echo>
</target>
