organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 04:29:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-7027 Fixing module target issues introduced recently.

Browse source 
X-SVN-Rev: 26405
This commit is contained in:
Yoshito Umaoka 2009-07-21 18:46:03 +00:00
parent 0f8b2d2379
commit a595b204e1
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
icu4j/build.xml
View file

@ -785,11 +785,13 @@
<!-- this module will soon be obsolete, use the collate jar -->
<target name="collator" description="Modular build of collator services">
<mkdir dir="${module.bin.dir}"/>
<javac srcdir="${icu4j.core.dir}/src"
destdir="${module.bin.dir}"
<javac destdir="${module.bin.dir}"
source="${javac.source}"
target="${javac.target}"
debug="on" deprecation="off">
<src path="${icu4j.core.dir}/src"/>
<src path="${icu4j.collate.dir}/src"/>
<include name="com/ibm/icu/impl/data/*Break*.java"/>
<include name="com/ibm/icu/text/*BreakIterator*.java"/>
<include name="com/ibm/icu/text/*Collation*.java"/>
@ -821,12 +823,14 @@
debug="on" deprecation="off">
<src path="${icu4j.core.dir}/src"/>
<src path="${icu4j.test-framework.dir}/src"/>
<src path="${icu4j.core-tests.dir}/src"/>
<src path="${icu4j.collate-tests.dir}/src"/>
<patternset refid="common.test.sources"/>
<include name="com/ibm/icu/dev/test/TestAllCollate.java"/>
<include name="com/ibm/icu/dev/test/collator/**/*.java"/>
<include name="java,com/ibm/icu/dev/test/search/**/*.java"/>
<exclude name="com/ibm/icu/dev/test/collator/RandomCollator.java"/>
<exclude name="com/ibm/icu/dev/test/collator/IndexCharactersTest.java"/>
</javac>
<unjar src="${icu4j.testdata.jar}" dest="${module.tests.dir}">
@ -835,7 +839,7 @@
</patternset>
</unjar>
<copy todir="${module.tests.dir}">
<fileset dir="${icu4j.core-tests.dir}/src">
<fileset dir="${icu4j.collate-tests.dir}/src">
<include name="com/ibm/icu/dev/data/riwords.txt"/>
<include name="com/ibm/icu/dev/data/CollationTest_*.txt"/>
</fileset>
@ -1065,11 +1069,13 @@
<!-- this module will soon be obsolete, use the translit jar -->
<target name="transliterator" depends="_propertiesClasses" description="Modular build of transliterator services">
<mkdir dir="${module.bin.dir}"/>
<javac srcdir="${icu4j.core.dir}/src"
destdir="${module.bin.dir}"
<javac destdir="${module.bin.dir}"
source="${javac.source}"
target="${javac.target}"
debug="on" deprecation="off">
<src path="${icu4j.core.dir}/src"/>
<src path="${icu4j.translit.dir}/src"/>
<include name="com/ibm/icu/impl/*Iterator*.java"/>
<include name="com/ibm/icu/impl/*Property*.java"/>
<include name="com/ibm/icu/impl/data/ResourceReader.java"/>
@ -1104,14 +1110,15 @@
debug="on" deprecation="off">
<src path="${icu4j.core.dir}/src"/>
<src path="${icu4j.test-framework.dir}/src"/>
<src path="${icu4j.core-tests.dir}/src"/>
<src path="${icu4j.translit-tests.dir}/src"/>
<patternset refid="common.test.sources"/>
<include name="com/ibm/icu/dev/test/TestAllTranslit.java"/>
<include name="com/ibm/icu/dev/test/translit/**/*.java"/>
<exclude name="com/ibm/icu/dev/test/translit/UnicodeFilterLogic*.java"/>
</javac>
<copy file="${icu4j.core-tests.dir}/src/com/ibm/icu/dev/test/translit/langtagRegex.txt"
<copy file="${icu4j.translit-tests.dir}/src/com/ibm/icu/dev/test/translit/langtagRegex.txt"
todir="${module.tests.dir}/com/ibm/icu/dev/test/translit"/>
</target>

6
icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java
View file

@ -6,6 +6,7 @@
*/
package com.ibm.icu.dev.test.lang;
import java.text.NumberFormat;
import java.text.ParsePosition;
import java.util.ArrayList;
import java.util.Arrays;
@ -26,7 +27,6 @@ import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.lang.UProperty;
import com.ibm.icu.lang.UScript;
import com.ibm.icu.lang.UCharacterEnums.ECharacterCategory;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.text.SymbolTable;
import com.ibm.icu.text.UTF16;
import com.ibm.icu.text.UnicodeMatcher;
@ -887,7 +887,7 @@ public class UnicodeSetTest extends TestFmwk {
double jtime = (middle - start)/iterations;
double utime = (end - middle)/iterations;
java.text.NumberFormat nf = java.text.NumberFormat.getPercentInstance();
NumberFormat nf = NumberFormat.getPercentInstance();
logln("Test contains: " + message + ": Java: " + jtime
+ ", Utility: " + utime + ", u:j: " + nf.format(utime/jtime));
}
@ -915,7 +915,7 @@ public class UnicodeSetTest extends TestFmwk {
double jtime = (middle - start)/iterations;
double utime = (end - middle)/iterations;
java.text.NumberFormat nf = java.text.NumberFormat.getPercentInstance();
NumberFormat nf = NumberFormat.getPercentInstance();
logln("Test equals: " + message + ": Java: " + jtime
+ ", Utility: " + utime + ", u:j: " + nf.format(utime/jtime));
}