ICU-11771 move FilteredBreakIterator from i18n to common

X-SVN-Rev: 37676

diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in
index 4ac4dc22bf874d1d7ab49ac2514bf61f619ad1f0..081aa5388ce9280e4bd5a91c128d8170fcd852b7 100644 (file)
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@@ -99,7 +99,7 @@ chariter.o schriter.o uchriter.o uiter.o \
 patternprops.o uchar.o uprops.o ucase.o propname.o ubidi_props.o ubidi.o ubidiwrt.o ubidiln.o ushape.o \
 uscript.o uscript_props.o usc_impl.o unames.o \
 utrie.o utrie2.o utrie2_builder.o bmpset.o unisetspan.o uset_props.o uniset_props.o uniset_closure.o uset.o uniset.o usetiter.o ruleiter.o caniter.o unifilt.o unifunct.o \
-uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o \
+uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o filteredbrk.o \
 rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
 serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \
 uidna.o usprep.o uts46.o punycode.o \

diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 74ce58faa547bae85376514f99ad9a9748b32f5e..9c7f69ed8a523b663c6181b0de011f84e40d6614 100644 (file)
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -232,6 +232,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="filteredbrk.cpp" />
     <ClCompile Include="ubidi.c" />
     <ClCompile Include="ubidi_props.c" />
     <ClCompile Include="ubidiln.c" />
@@ -398,7 +399,7 @@
     <ClCompile Include="uchar.c" />
     <ClCompile Include="unames.cpp" />
     <ClCompile Include="unifiedcache.cpp">
-    <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
     </ClCompile>
     <ClCompile Include="unifilt.cpp" />
     <ClCompile Include="unifunct.cpp" />
@@ -624,6 +625,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
+    <ClInclude Include="unicode\filteredbrk.h" />
     <ClInclude Include="ustrenum.h" />
     <ClInclude Include="utrie.h" />
     <ClInclude Include="utrie2.h" />
@@ -1769,4 +1771,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/icu4c/source/common/common.vcxproj.filters b/icu4c/source/common/common.vcxproj.filters
index 06f89f5f934e8e75dc2f5bcb8f65d6ca5a441d26..2e0f7c9e3e869aee5d948e3c6edb3aad43d58994 100644 (file)
--- a/icu4c/source/common/common.vcxproj.filters
+++ b/icu4c/source/common/common.vcxproj.filters
@@ -575,6 +575,9 @@
     <ClCompile Include="uloc_keytype.cpp">
       <Filter>locales &amp; resources</Filter>
     </ClCompile>
+    <ClCompile Include="filteredbrk.cpp">
+      <Filter>break iteration</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ubidi_props.h">
@@ -862,6 +865,9 @@
     <ClInclude Include="patternprops.h">
       <Filter>properties &amp; sets</Filter>
     </ClInclude>
+    <ClInclude Include="unicode\filteredbrk.h">
+      <Filter>break iteration</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="common.rc">

diff --git a/icu4c/source/i18n/filteredbrk.cpp b/icu4c/source/common/filteredbrk.cpp
similarity index 98%
rename from icu4c/source/i18n/filteredbrk.cpp
rename to icu4c/source/common/filteredbrk.cpp
index 7ecb004b3ff77c63a007d234f3639ef0d26d663e..0eec648d188222c4816875768ed29d8fbca95d6b 100644 (file)
--- a/icu4c/source/i18n/filteredbrk.cpp
+++ b/icu4c/source/common/filteredbrk.cpp
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-* Copyright (C) 2014, International Business Machines Corporation and
+* Copyright (C) 2014-2015, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 */
@@ -52,7 +52,7 @@ static int8_t U_CALLCONV compareUnicodeString(UElement t1, UElement t2) {
 /**
  * A UVector which implements a set of strings.
  */
-class U_I18N_API UStringSet : public UVector {
+class U_COMMON_API UStringSet : public UVector {
  public:
   UStringSet(UErrorCode &status) : UVector(uprv_deleteUObject,
                                            uhash_compareUnicodeString,
@@ -298,7 +298,7 @@ int32_t SimpleFilteredSentenceBreakIterator::next() {
 /**
  * Concrete implementation of builder class.
  */
-class U_I18N_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder {
+class U_COMMON_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder {
 public:
   virtual ~SimpleFilteredBreakIteratorBuilder();
   SimpleFilteredBreakIteratorBuilder(const Locale &fromLocale, UErrorCode &status);

diff --git a/icu4c/source/i18n/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h
similarity index 97%
rename from icu4c/source/i18n/unicode/filteredbrk.h
rename to icu4c/source/common/unicode/filteredbrk.h
index 1412418be50bbaa4c5a642f78f5fd07b1b4d6dfe..a1a5719538cc472005283a5cd423a5aa84131517 100644 (file)
--- a/icu4c/source/i18n/unicode/filteredbrk.h
+++ b/icu4c/source/common/unicode/filteredbrk.h
@@ -1,6 +1,6 @@
 /*
 ********************************************************************************
-*   Copyright (C) 1997-2014, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 */
@@ -44,7 +44,7 @@ U_NAMESPACE_BEGIN
  *
  * @internal technology preview
  */
-class U_I18N_API FilteredBreakIteratorBuilder : public UObject {
+class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
  public:
   /**
    *  destructor.

diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in
index bb730d6a44de3d09136d997ba2e6fd5d4c0c9674..ece8e54a0ba3b847ddd18bbed985db338330a0bd 100644 (file)
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@ -94,7 +94,7 @@ uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o uspoof_wsconf.o decfmtst.o s
 ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o ufieldpositer.o locdspnm.o \
 decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \
 tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o identifier_info.o \
-uregion.o reldatefmt.o quantityformatter.o measunit.o filteredbrk.o \
+uregion.o reldatefmt.o quantityformatter.o measunit.o \
 sharedbreakiterator.o scientificnumberformatter.o
 
 ## Header files to install

diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index dd9aa80aef2d81dd4f8c9df4efd9b791ce3f1afc..b668cf6089e83b15195380cee4ef4ae9b5cf08c2 100644 (file)
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -244,7 +244,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="filteredbrk.cpp" />
     <ClCompile Include="region.cpp" />
     <ClCompile Include="uregion.cpp" />
     <ClCompile Include="alphaindex.cpp" />
@@ -668,7 +667,6 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="unicode\filteredbrk.h" />
     <ClInclude Include="usrchimp.h" />
     <ClInclude Include="astro.h" />
     <CustomBuild Include="unicode\basictz.h">
@@ -1717,4 +1715,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters
index 1ea1a78e06a29765af99ec0e44545bdac5a6d19e..fe836dc1b0ecb0ac0d3ba5a266fb1b02e8c63dda 100644 (file)
--- a/icu4c/source/i18n/i18n.vcxproj.filters
+++ b/icu4c/source/i18n/i18n.vcxproj.filters
@@ -510,9 +510,6 @@
     <ClCompile Include="uregion.cpp">
       <Filter>formatting</Filter>
     </ClCompile>
-    <ClCompile Include="filteredbrk.cpp">
-      <Filter>misc</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="bocsu.cpp">
@@ -1213,9 +1210,4 @@
       <Filter>formatting</Filter>
     </CustomBuild>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="unicode\filteredbrk.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/icu4c/source/test/depstest/dependencies.txt b/icu4c/source/test/depstest/dependencies.txt
index 5e0e73468e642a9189394c1d1f823037abf3e388..23c4a999ceb29f99eb05a864ce7ae5128a02ce1e 100644 (file)
--- a/icu4c/source/test/depstest/dependencies.txt
+++ b/icu4c/source/test/depstest/dependencies.txt
@@ -175,6 +175,11 @@ group: breakiterator
     rbbi.o rbbinode.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o
     rbbidata.o rbbirb.o
     dictionarydata.o dictbe.o
+
+    # Folded 'filteredbrk' in to this group.
+    # it depends on global new/delete and STL. Not recording these here.
+    # http://bugs.icu-project.org/trac/ticket/10990
+    filteredbrk.o
   deps
     resourcebundle service_registration
     schriter utext uniset_core uniset_props
@@ -740,7 +745,6 @@ library: i18n
     region localedata genderinfo charset_detector spoof_detection
     alphabetic_index collation collation_builder string_search
     formatting formattable_cnv regex regex_cnv translit
-    filteredbreakiterator
     universal_time_scale
     uclean_i18n
 
@@ -907,17 +911,6 @@ group: translit
     formatting  # for Transliterator::getDisplayName()
     uclean_i18n
 
-# This is off by default, UCONFIG_NO_FILTERED_BREAK_ITERATION=0
-# so, you will see warnings:
-#Info:  group filteredbreakiterator  does not need to depend on  breakiterator
-#Info:  group filteredbreakiterator  does not need to depend on  ucharstriebuilder
-group: filteredbreakiterator
-    filteredbrk.o
-  deps
-    breakiterator ucharstriebuilder
-    # depends on global new/delete and STL. Not recording these here.
-    # http://bugs.icu-project.org/trac/ticket/10990
-
 group: universal_time_scale
     utmscale.o