mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 14:31:31 +00:00
ICU-5464 Fixed eclipse icu4j plug-in fragment (icu-jse4.jar) build problems.
X-SVN-Rev: 22546
This commit is contained in:
Yoshito Umaoka
parent
da2e965252
commit
ee3e82bc2c
8 changed files with 75 additions and 27 deletions
|
|
@ -1829,17 +1829,7 @@
|
|||
</target>
|
||||
|
||||
<target name="eclipseFragment" depends="eclipseCore,eclipseFragmentMangle">
|
||||
<property name="timepattern" value="yyyyMMdd'T'HHmmss','SSS"/>
|
||||
<tstamp>
|
||||
<format property="time.before.compile" pattern="${timepattern}"/>
|
||||
</tstamp>
|
||||
<!--
|
||||
Note: *.class files compiled by the target "eclipseCore" are in ${build.dir} directory.
|
||||
The target "eclipseFragmentMangle" updates timestamp of .java files, so only modified files
|
||||
should be compiled.
|
||||
-->
|
||||
<javac includes="com/ibm/icu/util/**/*.java,com/ibm/icu/text/**/*.java,com/ibm/icu/math/**/*.java,com/ibm/icu/impl/**/*.java,com/ibm/icu/lang/*.java"
|
||||
compiler="javac1.4"
|
||||
<javac compiler="javac1.4"
|
||||
srcdir="${src.dir}"
|
||||
destdir="${build.dir}"
|
||||
classpathref="build.classpath"
|
||||
|
|
@ -1848,14 +1838,63 @@
|
|||
debug="on"
|
||||
deprecation="off"
|
||||
encoding="ascii"
|
||||
listfiles="true" />
|
||||
<tstamp>
|
||||
<format property="time.after.compile" pattern="${timepattern}" />
|
||||
</tstamp>
|
||||
<!-- collect only class files updated, which are fragment specific files -->
|
||||
listfiles="true">
|
||||
<include name="com/ibm/icu/impl/DateNumberFormat.java" />
|
||||
<include name="com/ibm/icu/impl/duration/BasicDurationFormat.java" />
|
||||
<include name="com/ibm/icu/impl/ICUResourceBundleReader.java" />
|
||||
<include name="com/ibm/icu/impl/PatternTokenizer.java" />
|
||||
<include name="com/ibm/icu/impl/Utility.java" />
|
||||
<include name="com/ibm/icu/lang/UCharacter.java" />
|
||||
<include name="com/ibm/icu/math/BigDecimal.java" />
|
||||
<include name="com/ibm/icu/text/Bidi.java" />
|
||||
<include name="com/ibm/icu/text/ChineseDateFormat.java" />
|
||||
<include name="com/ibm/icu/text/DateFormat.java" />
|
||||
<include name="com/ibm/icu/text/DateTimePatternGenerator.java" />
|
||||
<include name="com/ibm/icu/text/DecimalFormat.java" />
|
||||
<include name="com/ibm/icu/text/DigitList.java" />
|
||||
<include name="com/ibm/icu/text/MessageFormat.java" />
|
||||
<include name="com/ibm/icu/text/NumberFormat.java" />
|
||||
<include name="com/ibm/icu/text/RuleBasedBreakIterator.java" />
|
||||
<include name="com/ibm/icu/text/RuleBasedNumberFormat.java" />
|
||||
<include name="com/ibm/icu/text/SimpleDateFormat.java" />
|
||||
<include name="com/ibm/icu/text/UnicodeSet.java" />
|
||||
<include name="com/ibm/icu/text/UTF16.java" />
|
||||
</javac>
|
||||
|
||||
<!-- collect fragment specific files -->
|
||||
<jar jarfile="${fragment.jar.file}" compress="true">
|
||||
<fileset dir="${build.dir}" includes="**/*.class">
|
||||
<date datetime="${time.before.compile}" pattern="${timepattern}" when="after" />
|
||||
<fileset dir="${build.dir}">
|
||||
<include name="com/ibm/icu/impl/DateNumberFormat.class" />
|
||||
<include name="com/ibm/icu/impl/duration/BasicDurationFormat.class" />
|
||||
<include name="com/ibm/icu/impl/ICUResourceBundleReader.class" />
|
||||
<include name="com/ibm/icu/impl/PatternTokenizer.class" />
|
||||
<include name="com/ibm/icu/impl/Utility.class" />
|
||||
<include name="com/ibm/icu/lang/UCharacter.class" />
|
||||
<include name="com/ibm/icu/math/BigDecimal.class" />
|
||||
<include name="com/ibm/icu/text/Bidi.class" />
|
||||
<include name="com/ibm/icu/text/ChineseDateFormat.class" />
|
||||
<include name="com/ibm/icu/text/DateFormat.class" />
|
||||
<include name="com/ibm/icu/text/DateTimePatternGenerator.class" />
|
||||
<include name="com/ibm/icu/text/DecimalFormat.class" />
|
||||
<include name="com/ibm/icu/text/DigitList.class" />
|
||||
<include name="com/ibm/icu/text/MessageFormat.class" />
|
||||
<include name="com/ibm/icu/text/NumberFormat.class" />
|
||||
<include name="com/ibm/icu/text/RuleBasedBreakIterator.class" />
|
||||
<include name="com/ibm/icu/text/RuleBasedNumberFormat.class" />
|
||||
<include name="com/ibm/icu/text/SimpleDateFormat.class" />
|
||||
<include name="com/ibm/icu/text/UnicodeSet.class" />
|
||||
<include name="com/ibm/icu/text/UTF16.class" />
|
||||
|
||||
<include name="com/ibm/icu/lang/UCharacter$*.class" />
|
||||
<include name="com/ibm/icu/text/Bidi$*.class" />
|
||||
<include name="com/ibm/icu/text/ChineseDateFormat$*.class" />
|
||||
<include name="com/ibm/icu/text/DateFormat$*.class" />
|
||||
<include name="com/ibm/icu/text/DateTimePatternGenerator$*.class" />
|
||||
<include name="com/ibm/icu/text/MessageFormat$*.class" />
|
||||
<include name="com/ibm/icu/text/NumberFormat$*.class" />
|
||||
<include name="com/ibm/icu/text/SimpleDateFormat$*.class" />
|
||||
<include name="com/ibm/icu/text/UnicodeSet$*.class" />
|
||||
<include name="com/ibm/icu/text/UTF16$*.class" />
|
||||
</fileset>
|
||||
</jar>
|
||||
</target>
|
||||
|
|
@ -1871,21 +1910,28 @@
|
|||
<!-- PLUGIN FILES -->
|
||||
<!-- source -->
|
||||
<copy toDir="${eclipse.projects.dir}/plugins/com.ibm.icu.jse4/src">
|
||||
<!-- TODO: Use a single file list as input. The list is identical with eclipseFragmentArgs.txt -->
|
||||
<!-- TODO: Better way to collect files? -->
|
||||
<fileset dir="${src.dir}">
|
||||
<include name="com/ibm/icu/impl/CollectionUtilities.java" />
|
||||
<include name="com/ibm/icu/impl/DateNumberFormat.java" />
|
||||
<include name="com/ibm/icu/impl/duration/BasicDurationFormat.java" />
|
||||
<include name="com/ibm/icu/impl/ICUResourceBundleReader.java" />
|
||||
<include name="com/ibm/icu/impl/PatternTokenizer.java" />
|
||||
<include name="com/ibm/icu/impl/Utility.java" />
|
||||
<include name="com/ibm/icu/lang/UCharacter.java" />
|
||||
<include name="com/ibm/icu/math/BigDecimal.java" />
|
||||
<include name="com/ibm/icu/text/Bidi.java" />
|
||||
<include name="com/ibm/icu/text/ChineseDateFormat.java" />
|
||||
<include name="com/ibm/icu/text/DateFormat.java" />
|
||||
<include name="com/ibm/icu/text/DateTimePatternGenerator.java" />
|
||||
<include name="com/ibm/icu/text/DecimalFormat.java" />
|
||||
<include name="com/ibm/icu/text/DigitList.java" />
|
||||
<include name="com/ibm/icu/text/MessageFormat.java" />
|
||||
<include name="com/ibm/icu/text/NumberFormat.java" />
|
||||
<include name="com/ibm/icu/text/RuleBasedBreakIterator.java" />
|
||||
<include name="com/ibm/icu/text/RuleBasedNumberFormat.java" />
|
||||
<include name="com/ibm/icu/text/SimpleDateFormat.java" />
|
||||
<include name="com/ibm/icu/text/UnicodeSet.java" />
|
||||
<include name="com/ibm/icu/text/UTF16.java" />
|
||||
<include name="com/ibm/icu/util/GlobalizationPreferences.java" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<!-- project files -->
|
||||
|
|
|
|||
|
|
@ -2,5 +2,9 @@
|
|||
# others. All Rights Reserved.
|
||||
|
||||
# These files contains special code blocks for the ICU Eclipse fragment
|
||||
src/com/ibm/icu/impl/ByteBuffer.java
|
||||
src/com/ibm/icu/impl/ICUResourceBundleImpl.java
|
||||
src/com/ibm/icu/lang/UCharacter.java
|
||||
src/com/ibm/icu/text/DecimalFormat.java
|
||||
src/com/ibm/icu/text/RuleBasedCollator.java
|
||||
src/com/ibm/icu/util/UResourceBundle.java
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
src/com/ibm/icu/impl/ByteBuffer.java
|
||||
src/com/ibm/icu/impl/DateNumberFormat.java
|
||||
src/com/ibm/icu/impl/duration/BasicDurationFormat.java
|
||||
src/com/ibm/icu/impl/ICUResourceBundle.java
|
||||
src/com/ibm/icu/impl/ICUResourceBundleImpl.java
|
||||
src/com/ibm/icu/impl/ICUResourceBundleReader.java
|
||||
src/com/ibm/icu/impl/PatternTokenizer.java
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//##header J2SE15
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13)
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT)
|
||||
//##/*
|
||||
//## * *****************************************************************************
|
||||
//## * Copyright (C) 2006-2007, International Business Machines
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
//##header J2SE15
|
||||
/*
|
||||
* *****************************************************************************
|
||||
* Copyright (C) 2005-2007, International Business Machines Corporation and * others.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import com.ibm.icu.util.UResourceBundle;
|
|||
import com.ibm.icu.util.UResourceBundleIterator;
|
||||
import com.ibm.icu.util.UResourceTypeMismatchException;
|
||||
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13)
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT)
|
||||
//#else
|
||||
import java.nio.ByteBuffer;
|
||||
//#endif
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import java.text.ParseException;
|
|||
import java.util.Arrays;
|
||||
import java.util.MissingResourceException;
|
||||
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13)
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT)
|
||||
//##import com.ibm.icu.impl.ByteBuffer;
|
||||
//#else
|
||||
import java.nio.ByteBuffer;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import com.ibm.icu.impl.ICUResourceBundleReader;
|
|||
import com.ibm.icu.impl.ResourceBundleWrapper;
|
||||
import com.ibm.icu.util.ULocale;
|
||||
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13)
|
||||
//#if defined(FOUNDATION10) || defined(J2SE13) || defined(ECLIPSE_FRAGMENT)
|
||||
//##import com.ibm.icu.impl.ByteBuffer;
|
||||
//#else
|
||||
import java.nio.ByteBuffer;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue