You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/03/28 03:06:41 UTC
svn commit: r1306091 - in /lucene/dev/branches/lucene3930/lucene:
common-build.xml contrib/misc/ant_lib/ contrib/misc/build.xml
Author: uschindler
Date: Wed Mar 28 01:06:40 2012
New Revision: 1306091
URL: http://svn.apache.org/viewvc?rev=1306091&view=rev
Log:
cpptasks added
Removed:
lucene/dev/branches/lucene3930/lucene/contrib/misc/ant_lib/
Modified:
lucene/dev/branches/lucene3930/lucene/common-build.xml
lucene/dev/branches/lucene3930/lucene/contrib/misc/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=1306091&r1=1306090&r2=1306091&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Wed Mar 28 01:06:40 2012
@@ -808,7 +808,7 @@
<target name="install-maven-tasks" depends="install-ivy" unless="maven-tasks.uptodate">
<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" pathid="maven-ant-tasks.classpath"/>
+ inline="true" conf="master" type="jar" pathid="maven-ant-tasks.classpath"/>
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath"/>
Modified: lucene/dev/branches/lucene3930/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/misc/build.xml?rev=1306091&r1=1306090&r2=1306091&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/misc/build.xml Wed Mar 28 01:06:40 2012
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="misc" default="default">
+<project name="misc" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- TODO: add javacc capability for PrecedenceQueryParser -->
@@ -27,15 +27,15 @@
<import file="../contrib-build.xml"/>
- <target name="build-native-unix" >
- <mkdir dir="${common.build.dir}/native"/>
+ <target name="install-cpptasks" depends="install-ivy" unless="cpptasks.uptodate">
+ <property name="maven-tasks.uptodate" value="true"/>
+ <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
+ inline="true" conf="master" type="jar" pathid="cpptasks.classpath"/>
+ <taskdef resource="cpptasks.tasks" classpathref="cpptasks.classpath"/>
+ </target>
- <taskdef resource="cpptasks.tasks">
- <classpath>
- <!-- TODO: nuke this jar and load up like maven-ant-tasks -->
- <pathelement location="ant_lib/cpptasks-1.0b5.jar"/>
- </classpath>
- </taskdef>
+ <target name="build-native-unix" depends="install-cpptasks">
+ <mkdir dir="${common.build.dir}/native"/>
<cc outtype="shared" subsystem="console" outfile="${common.build.dir}/native/NativePosixUtil" >
<fileset file="${src.dir}/org/apache/lucene/store/NativePosixUtil.cpp" />