svn commit: r1306134 - in /lucene/dev/branches/lucene3930/lucene: ./ common-build.xml

[rm...@apache.org]

Author: rmuir
Date: Wed Mar 28 03:14:10 2012
New Revision: 1306134

URL: http://svn.apache.org/viewvc?rev=1306134&view=rev
Log:
LUCENE-3930: clean this up. issue a warning when we have to auto-download ivy, and don't put it in test-framework/lib

Modified:
    lucene/dev/branches/lucene3930/lucene/   (props changed)
    lucene/dev/branches/lucene3930/lucene/common-build.xml

Modified: lucene/dev/branches/lucene3930/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/common-build.xml?rev=1306134&r1=1306133&r2=1306134&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Wed Mar 28 03:14:10 2012
@@ -54,8 +54,7 @@
   <property name="final.name" value="lucene-${name}-${version}"/>
 
   <property name="ivy.install.version" value="2.2.0" />
-  <!-- todo: maybe a better place -->
-  <property name="ivy.jar.dir" value="${common.dir}/test-framework/lib" />
+  <property name="ivy.jar.dir" value="${common.dir}/ivy" />
   <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
   <available file="${ivy.jar.file}" property="ivy.available" />
 
@@ -257,7 +256,11 @@
   <target name="download-ivy" unless="ivy.available">
       <mkdir dir="${ivy.jar.dir}"/>
       <!-- download Ivy from web site so that it can be used even without any special installation -->
-      <echo message="installing ivy..."/>
+      <echo>
+      NOTE: You do not have ivy installed, so downloading it...
+      If you make lots of checkouts, download ivy-${ivy.install.version}.jar yourself 
+      and set ivy.jar.file to this in your ~/build.properties
+      </echo>
         <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
             dest="${ivy.jar.file}" usetimestamp="true"/>
    </target>