You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/04 16:43:20 UTC

svn commit: r1309423 - in /lucene/dev/trunk/lucene: common-build.xml contrib/misc/build.xml

Author: rmuir
Date: Wed Apr  4 14:43:19 2012
New Revision: 1309423

URL: http://svn.apache.org/viewvc?rev=1309423&view=rev
Log:
add ivy-check for these special inline usages too

Modified:
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/lucene/contrib/misc/build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1309423&r1=1309422&r2=1309423&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Wed Apr  4 14:43:19 2012
@@ -841,7 +841,7 @@
   	<fail message="You must redefine the javadocs task to do something!!!!!"/>
   </target>
 
-  <target name="install-maven-tasks" unless="maven-tasks.uptodate">
+  <target name="install-maven-tasks" unless="maven-tasks.uptodate" depends="ivy-availability-check,ivy-fail">
     <property name="maven-tasks.uptodate" value="true"/>
     <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
              inline="true" conf="master" type="jar" pathid="maven-ant-tasks.classpath"/>
@@ -900,6 +900,7 @@
     <property name="deployed.grandparent.pom.uptodate" value="true"/>
   </target>
 
+  <!-- TODO: add cool detector like the ivy one? this requires you have rat -->
   <target name="rat-sources-typedef">
     <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
       <classpath>

Modified: lucene/dev/trunk/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/build.xml?rev=1309423&r1=1309422&r2=1309423&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/misc/build.xml Wed Apr  4 14:43:19 2012
@@ -27,7 +27,7 @@
 
   <import file="../contrib-build.xml"/>
 
-  <target name="install-cpptasks" unless="cpptasks.uptodate">
+  <target name="install-cpptasks" unless="cpptasks.uptodate" depends="ivy-availability-check,ivy-fail">
     <property name="cpptasks.uptodate" value="true"/>
     <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
              inline="true" conf="master" type="jar" pathid="cpptasks.classpath"/>