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:26:51 UTC
svn commit: r1309018 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/kuromoji/ lucene/core/ lucene/core/src/
lucene/core/src/test/org/apache/lucene/analysis/ lucene/site/
lucene/test-framework/ lucene/tools/ solr/ solr/contrib/...
Author: hossman
Date: Tue Apr 3 16:26:50 2012
New Revision: 1309018
URL: http://svn.apache.org/viewvc?rev=1309018&view=rev
Log:
tweak build instructions related to ivy bootstraping (merge r1309015)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/build.xml
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/BUILD.txt
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/analysis/ (props changed)
lucene/dev/branches/branch_3x/lucene/site/ (props changed)
lucene/dev/branches/branch_3x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_3x/lucene/tools/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_3x/solr/README.txt
lucene/dev/branches/branch_3x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_3x/solr/contrib/ (props changed)
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/example/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/ (props changed)
lucene/dev/branches/branch_3x/solr/solrj/ (props changed)
lucene/dev/branches/branch_3x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_3x/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1309018&r1=1309017&r2=1309018&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Tue Apr 3 16:26:50 2012
@@ -138,7 +138,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/branches/branch_3x/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/BUILD.txt?rev=1309018&r1=1309017&r2=1309018&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/BUILD.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/BUILD.txt Tue Apr 3 16:26:50 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/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1309018&r1=1309017&r2=1309018&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Tue Apr 3 16:26:50 2012
@@ -285,7 +285,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/branches/branch_3x/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/README.txt?rev=1309018&r1=1309017&r2=1309018&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/README.txt (original)
+++ lucene/dev/branches/branch_3x/solr/README.txt Tue Apr 3 16:26:50 2012
@@ -66,16 +66,18 @@ Instructions for Building Apache Solr fr
on your command path. To test this, issue a "java -version" command from your
shell and verify that the Java version is 5.0 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 directory included on your
- command path. To test this, issue a "ant -version" command from your
- shell and verify that Ant is available.
+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
- 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.
-
Alternately, you can obtain a copy of the latest Apache Solr source code
directly from the Subversion repository: