ICU-7277 Fixed command line build problems introduced by previous changes.

X-SVN-Rev: 27054
This commit is contained in:
Yoshito Umaoka 2009-12-11 21:59:27 +00:00
parent 8aec2d2a55
commit fb723c62cb

View file

@ -15,6 +15,7 @@
<property name="icu4j-core.jar.file" value="icu4j-core.jar"/>
<property name="icu4j-collate.jar.file" value="icu4j-collate.jar"/>
<property name="icu4j-charsets.jar.file" value="icu4j-charsets.jar"/>
<property name="icu4j-currdata.jar.file" value="icu4j-currdata.jar"/>
<property name="icu4j-langdata.jar.file" value="icu4j-langdata.jar"/>
<property name="icu4j-localespi.jar.file" value="icu4j-localespi.jar"/>
<property name="icu4j-regiondata.jar.file" value="icu4j-regiondata.jar"/>
@ -67,6 +68,7 @@
<ant dir="${icu4j.core.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.collate.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.charset.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.currdata.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.langdata.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.localespi.dir}" target="clean" inheritAll="false"/>
<ant dir="${icu4j.regiondata.dir}" target="clean" inheritAll="false"/>
@ -94,7 +96,7 @@
<!-- meta build targets -->
<target name="all" depends="info, main, tests, localespi, localespi-tests, build-tools, tools, demos, jar, docs" description="Build all primary targets"/>
<target name="main" depends="info, core, collate, charset, langdata, regiondata, translit" description="Build ICU4J API classes"/>
<target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit" description="Build ICU4J API classes"/>
<target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests" description="Build ICU4J API test classes"/>
<target name="releaseJar" depends="info, jar, jarDocs, jarSrc" description="Build all jar files for distribution"/>
@ -142,6 +144,7 @@
<pathelement path="${icu4j.core.jar}"/>
<pathelement path="${icu4j.collate.jar}"/>
<pathelement path="${icu4j.charset.jar}"/>
<pathelement path="${icu4j.currdata.jar}"/>
<pathelement path="${icu4j.langdata.jar}"/>
<pathelement path="${icu4j.regiondata.jar}"/>
<pathelement path="${icu4j.translit.jar}"/>
@ -155,7 +158,7 @@
</target>
<target name="packagingCheck" depends="info, core, packaging-tests" description="Run packaging tests">
<!-- region data but no language data -->
<!-- region data but no language data -->
<java classname="com.ibm.icu.dev.test.TestPackaging" fork="yes" failonerror="true">
<arg line="-n -w"/>
<classpath>
@ -163,10 +166,10 @@
<pathelement path="${icu4j.charset.jar}"/>
<pathelement path="${icu4j.test-framework.jar}"/>
<pathelement path="${icu4j.packaging-tests.jar}"/>
<pathelement path="${icu4j.regiondata.jar}"/>
<pathelement path="${icu4j.regiondata.jar}"/>
</classpath>
</java>
<!-- language data but no region data -->
<!-- language data but no region data -->
<java classname="com.ibm.icu.dev.test.TestPackaging" fork="yes" failonerror="true">
<arg line="-n -w"/>
<classpath>
@ -174,10 +177,10 @@
<pathelement path="${icu4j.charset.jar}"/>
<pathelement path="${icu4j.test-framework.jar}"/>
<pathelement path="${icu4j.packaging-tests.jar}"/>
<pathelement path="${icu4j.langdata.jar}"/>
<pathelement path="${icu4j.langdata.jar}"/>
</classpath>
</java>
<!-- neither region nor language data -->
<!-- neither region nor language data -->
<java classname="com.ibm.icu.dev.test.TestPackaging" fork="yes" failonerror="true">
<arg line="-n -w"/>
<classpath>
@ -264,13 +267,14 @@
<copy file="${icu4j.core.jar}" tofile="${icu4j-core.jar.file}"/>
<copy file="${icu4j.collate.jar}" tofile="${icu4j-collate.jar.file}"/>
<copy file="${icu4j.charset.jar}" tofile="${icu4j-charsets.jar.file}"/>
<copy file="${icu4j.currdata.jar}" tofile="${icu4j-currdata.jar.file}"/>
<copy file="${icu4j.langdata.jar}" tofile="${icu4j-langdata.jar.file}"/>
<copy file="${icu4j.localespi.jar}" tofile="${icu4j-localespi.jar.file}" failonerror="false"/>
<copy file="${icu4j.regiondata.jar}" tofile="${icu4j-regiondata.jar.file}"/>
<copy file="${icu4j.translit.jar}" tofile="${icu4j-translit.jar.file}"/>
</target>
<target name="icu4jJar" depends="info, core, collate, langdata, regiondata, translit" description="Build ICU4J all-in-one core jar">
<target name="icu4jJar" depends="info, core, collate, currdata, langdata, regiondata, translit" description="Build ICU4J all-in-one core jar">
<mkdir dir="${out.dir}"/>
<!-- manifest -->
@ -288,6 +292,7 @@
manifest="${out.dir}/manifest.stub">
<fileset dir="${icu4j.core.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.collate.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.currdata.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.langdata.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.regiondata.dir}/${bin.dir}" includes="**/*"/>
<fileset dir="${icu4j.translit.dir}/${bin.dir}" includes="**/*"/>
@ -343,6 +348,10 @@
<ant dir="${icu4j.charset.dir}" inheritAll="false"/>
</target>
<target name="currdata" depends="core" description="Build currency data classes">
<ant dir="${icu4j.currdata.dir}" inheritAll="false"/>
</target>
<target name="langdata" depends="core" description="Build language data classes">
<ant dir="${icu4j.langdata.dir}" inheritAll="false"/>
</target>
@ -463,6 +472,9 @@
<ant dir="${icu4j.charset.dir}" inheritAll="false" inheritRefs="true">
<property name="build.compiler" value="${build.compiler}"/>
</ant>
<ant dir="${icu4j.currdata.dir}" inheritAll="false" inheritRefs="true">
<property name="build.compiler" value="${build.compiler}"/>
</ant>
<ant dir="${icu4j.langdata.dir}" inheritAll="false" inheritRefs="true">
<property name="build.compiler" value="${build.compiler}"/>
</ant>
@ -495,6 +507,7 @@
<pathelement path="${icu4j.core.jar}"/>
<pathelement path="${icu4j.collate.jar}"/>
<pathelement path="${icu4j.charset.jar}"/>
<pathelement path="${icu4j.currdata.jar}"/>
<pathelement path="${icu4j.langdata.jar}"/>
<pathelement path="${icu4j.regiondata.jar}"/>
<pathelement path="${icu4j.translit.jar}"/>