You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/04/03 18:22:07 UTC
svn commit: r1309015 - in /lucene/dev/trunk: build.xml lucene/BUILD.txt
lucene/common-build.xml solr/README.txt
Author: hossman
Date: Tue Apr 3 16:22:06 2012
New Revision: 1309015
URL: http://svn.apache.org/viewvc?rev=1309015&view=rev
Log:
tweak build instructions related to ivy bootstraping
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/BUILD.txt
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/README.txt
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1309015&r1=1309014&r2=1309015&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Tue Apr 3 16:22:06 2012
@@ -146,7 +146,7 @@
</delete>
</target>
- <target name="ivy-bootstrap">
+ <target name="ivy-bootstrap" description="Download and install Ivy in the users ant lib dir">
<subant target="ivy-bootstrap" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
</subant>
Modified: lucene/dev/trunk/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/BUILD.txt?rev=1309015&r1=1309014&r2=1309015&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/BUILD.txt (original)
+++ lucene/dev/trunk/lucene/BUILD.txt Tue Apr 3 16:22:06 2012
@@ -31,6 +31,8 @@ according to the instructions at:
Finally, you'll need to install ivy into your ant lib folder
(~/.ant/lib). You can get it from http://ant.apache.org/ivy/.
+If you skip this step, the Lucene build system will offer to do it
+for you.
Step 1) Download Lucene from Apache
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1309015&r1=1309014&r2=1309015&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Tue Apr 3 16:22:06 2012
@@ -297,7 +297,7 @@
<target name="ivy-fail" unless="ivy.available">
<fail>Ivy is not available</fail>
</target>
- <target name="ivy-bootstrap">
+ <target name="ivy-bootstrap" description="Download and install Ivy in the users ant lib dir">
<property name="ivy_install_path" location="${user.home}/.ant/lib" />
<mkdir dir="${ivy_install_path}"/>
<echo message="installing ivy ${ivy.bootstrap.version} to ${ivy_install_path}"/>
Modified: lucene/dev/trunk/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/README.txt?rev=1309015&r1=1309014&r2=1309015&view=diff
==============================================================================
--- lucene/dev/trunk/solr/README.txt (original)
+++ lucene/dev/trunk/solr/README.txt Tue Apr 3 16:22:06 2012
@@ -66,13 +66,15 @@ Instructions for Building Apache Solr fr
folder included on your command path. To test this, issue a "java -version" command
from your shell (command prompt) and verify that the Java version is 1.6 or later.
-2. Download the Apache Ant binary distribution (1.7.x, not 1.6.x, not 1.8.x) from http://ant.apache.org/
- You will need Ant installed and the $ANT_HOME/bin (Windows: %ANT_HOME%\bin) folder
- included on your command path. To test this, issue a "ant -version" command from your
- shell (command prompt) and verify that Ant is available.
-
- Install Apache Ivy binary distribution (2.2.0) from http://ant.apache.org/ivy/
- You will need to place ivy-2.2.0.jar file in ~/.ant/lib.
+2. Download the Apache Ant binary distribution (1.7.x, not 1.6.x, not 1.8.x) from
+ http://ant.apache.org/ You will need Ant installed and the $ANT_HOME/bin (Windows:
+ %ANT_HOME%\bin) folder included on your command path. To test this, issue a
+ "ant -version" command from your shell (command prompt) and verify that Ant is
+ available.
+
+ You will also need to install Apache Ivy binary distribution (2.2.0) from
+ http://ant.apache.org/ivy/ and place ivy-2.2.0.jar file in ~/.ant/lib -- if you skip
+ this step, the Solr build system will offer to do it for you.
3. Download the Apache Solr distribution, linked from the above web site.
Unzip the distribution to a folder of your choice, e.g. C:\solr or ~/solr