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/03/28 03:08:11 UTC
svn commit: r1306094 - in
/lucene/dev/branches/lucene3930/modules/analysis/icu: build.xml lib/
Author: rmuir
Date: Wed Mar 28 01:08:10 2012
New Revision: 1306094
URL: http://svn.apache.org/viewvc?rev=1306094&view=rev
Log:
LUCENE-3930: clean up icu build and fix tools tasks to work 'the first time'
Modified:
lucene/dev/branches/lucene3930/modules/analysis/icu/build.xml
lucene/dev/branches/lucene3930/modules/analysis/icu/lib/ (props changed)
Modified: lucene/dev/branches/lucene3930/modules/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/icu/build.xml?rev=1306094&r1=1306093&r2=1306094&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/icu/build.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/icu/build.xml Wed Mar 28 01:08:10 2012
@@ -27,19 +27,15 @@
<property name="build.dir" location="../build/icu" />
<property name="dist.dir" location="../dist/icu" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="icu4j-*.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
- targetos="unix"
- refid="additional.dependencies"
- />
-
<import file="../../../lucene/contrib/contrib-build.xml"/>
+ <path id="icujar">
+ <pathelement location="lib/icu4j-4.8.1.1.jar"/>
+ </path>
+
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
+ <path refid="icujar"/>
<path refid="base.classpath"/>
</path>
@@ -82,7 +78,7 @@ are part of the ICU4C package. See http:
fork="true"
failonerror="true">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
@@ -104,7 +100,7 @@ are part of the ICU4C package. See http:
failonerror="true"
output="${uax29.supp.macros.output.file}">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
@@ -124,13 +120,13 @@ are part of the ICU4C package. See http:
failonerror="true"
output="${html.strip.charfilter.supp.macros.output.file}">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
</java>
</target>
- <target name="compile-tools" depends="common.compile-tools">
+ <target name="compile-tools" depends="init,common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">