Kaydet (Commit) 1733e4ad authored tarafından Khaled Hosny's avatar Khaled Hosny

Don't build icule library as we no longer use it

Change-Id: I25401eee45988bf4d156c11d9a5848c783204c02
üst b6ecac9f
......@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_externals,merged,\
harfbuzz \
hunspell \
icui18n \
icule \
icuuc \
jpeg \
lcms2 \
......
......@@ -1062,10 +1062,6 @@ endef
define gb_LinkTarget__use_icui18n
$(call gb_LinkTarget_add_libs,$(1),-licui18n)
endef
define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_libs,$(1),-licule)
endef
define gb_LinkTarget__use_icutu
$(call gb_LinkTarget_add_libs,$(1),-licutu)
......@@ -1144,18 +1140,10 @@ endef
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icule$(gb_ICU_suffix) \
icutu$(gb_ICU_suffix) \
icuuc$(gb_ICU_suffix) \
))
define gb_LinkTarget__use_icule
$(call gb_LinkTarget_use_package,$(1),icu)
$(call gb_LinkTarget_use_libraries,$(1),\
icule$(gb_ICU_suffix) \
)
endef
define gb_LinkTarget__use_icutu
$(call gb_LinkTarget_use_package,$(1),icu)
$(call gb_LinkTarget_use_libraries,$(1),\
......
......@@ -102,7 +102,7 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
gb_Library_NOILIBFILENAMES_D := \
icudt icuin icule icuuc \
icudt icuin icuuc \
lcms2 \
# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
......
......@@ -16,7 +16,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
i18nlangtag \
$(if $(findstring YES,$(SYSTEM_ICU)),,\
icui18n \
icule \
icuuc \
) \
lng \
......
......@@ -18,13 +18,11 @@ ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata.dll.a,source/stubdata/icudt.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc.dll.a,source/lib/icuuc.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n.dll.a,source/lib/icuin.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule.dll.a,source/lib/icule.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu.dll.a,source/lib/icutu.lib))
$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(ICU_MAJOR).dll \
source/lib/icuuc$(ICU_MAJOR).dll \
source/lib/icuin$(ICU_MAJOR).dll \
source/lib/icule$(ICU_MAJOR).dll \
source/lib/icutu$(ICU_MAJOR).dll \
))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
......@@ -38,14 +36,12 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib\
))
$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
......@@ -60,7 +56,6 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/libicudata.a \
source/lib/libicuuc.a \
source/lib/libicui18n.a \
source/lib/libicule.a \
source/lib/libicutu.a \
))
else ifeq ($(OS),ANDROID)
......@@ -68,7 +63,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
source/lib/libicudatalo.so \
source/lib/libicuuclo.so \
source/lib/libicui18nlo.so \
source/lib/libiculelo.so \
source/lib/libicutulo.so \
))
else
......@@ -81,9 +75,6 @@ $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),s
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
......
......@@ -38,9 +38,9 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
--enable-layout --disable-static --enable-shared --disable-samples \
--disable-layout --disable-static --enable-shared --disable-samples \
&& $(MAKE) \
&& for lib in icudata icuin icuuc icule icutu; do \
&& for lib in icudata icuin icuuc icutu; do \
touch $$lib; \
done \
,source)
......@@ -70,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
./configure \
--enable-layout --disable-samples \
--disable-layout --disable-samples \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
$(if $(filter ANDROID,$(OS)),--disable-strict) \
$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
......@@ -85,7 +85,6 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \
,source)
......
......@@ -19,10 +19,7 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c.10129.wintz.patch \
icu/icu4c.9948.mlym-crash.patch \
icu/icu4c-build.patch \
icu/icu4c.8198.revert.icu5431.patch \
icu/icu4c.7601.Indic-ccmp.patch \
icu/icu4c-aix.patch \
icu/icu4c-wchar_t.patch \
icu/icu4c-warnings.patch \
......
......@@ -87,25 +87,3 @@
## Remove shared library 's'
STATIC_PREFIX_WHEN_USED =
--- misc/icu/source/layout/ArabicShaping.cpp 2010-09-29 20:38:38.000000000 +0200
+++ misc/build/icu/source/layout/ArabicShaping.cpp 2011-03-15 10:56:26.655056238 +0100
@@ -79,7 +79,6 @@
#define markFeatureMask 0x00040000UL
#define mkmkFeatureMask 0x00020000UL
-#define NO_FEATURES 0
#define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask)
#define SHAPE_MASK 0xF0000000UL
@@ -174,11 +173,7 @@
LEUnicode c = chars[in];
ShapeType t = getShapeType(c);
- if (t == ST_NOSHAPE_NONE) {
- glyphStorage.setAuxData(out, NO_FEATURES, success);
- } else {
glyphStorage.setAuxData(out, ISOL_FEATURES, success);
- }
if ((t & MASK_TRANSPARENT) != 0) {
continue;
--- misc/icu/source/layout/IndicReordering.cpp 2009-07-01 20:51:26.000000000 +0200
+++ misc/build/icu/source/layout/IndicReordering.cpp 2011-01-08 11:12:49.950566538 +0100
@@ -13,6 +13,7 @@
U_NAMESPACE_BEGIN
+#define ccmpFeatureTag LE_CCMP_FEATURE_TAG
#define loclFeatureTag LE_LOCL_FEATURE_TAG
#define initFeatureTag LE_INIT_FEATURE_TAG
#define nuktFeatureTag LE_NUKT_FEATURE_TAG
@@ -35,6 +36,7 @@
#define caltFeatureTag LE_CALT_FEATURE_TAG
#define kernFeatureTag LE_KERN_FEATURE_TAG
+#define ccmpFeatureMask 0x00000001UL
#define loclFeatureMask 0x80000000UL
#define rphfFeatureMask 0x40000000UL
#define blwfFeatureMask 0x20000000UL
@@ -73,7 +75,7 @@
#define repositionedGlyphMask 0x00000002UL
-#define basicShapingFormsMask ( loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
+#define basicShapingFormsMask ( ccmpFeatureMask | loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
#define positioningFormsMask ( kernFeatureMask | distFeatureMask | abvmFeatureMask | blwmFeatureMask )
#define presentationFormsMask ( presFeatureMask | abvsFeatureMask | blwsFeatureMask | pstsFeatureMask | halnFeatureMask | caltFeatureMask )
@@ -480,6 +482,7 @@
#define tagArray0 (rphfFeatureMask | tagArray1)
static const FeatureMap featureMap[] = {
+ {ccmpFeatureTag, ccmpFeatureMask},
{loclFeatureTag, loclFeatureMask},
{initFeatureTag, initFeatureMask},
{nuktFeatureTag, nuktFeatureMask},
@@ -502,6 +505,7 @@
static const le_int32 featureCount = LE_ARRAY_SIZE(featureMap);
static const FeatureMap v2FeatureMap[] = {
+ {ccmpFeatureTag, ccmpFeatureMask},
{loclFeatureTag, loclFeatureMask},
{nuktFeatureTag, nuktFeatureMask},
{akhnFeatureTag, akhnFeatureMask},
--- misc/icu/source/layout/IndicReordering.cpp (revision 26090)
+++ misc/build/icu/source/layout/IndicReordering.cpp (revision 25772)
@@ -126,8 +126,4 @@
FeatureMask fSMFeatures;
- LEUnicode fPreBaseConsonant;
- LEUnicode fPreBaseVirama;
- le_int32 fPBCIndex;
- FeatureMask fPBCFeatures;
void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
@@ -176,6 +172,5 @@
fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
- fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
{
// nothing else to do...
@@ -196,6 +191,4 @@
fVMabove = fVMpost = 0;
fSMabove = fSMbelow = 0;
-
- fPreBaseConsonant = fPreBaseVirama = 0;
}
@@ -393,12 +386,4 @@
}
- void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
- {
- fPBCIndex = index;
- fPreBaseConsonant = PBConsonant;
- fPreBaseVirama = PBVirama;
- fPBCFeatures = features;
- }
-
void noteBaseConsonant()
{
@@ -480,20 +465,4 @@
}
- void writePreBaseConsonant()
- {
- // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
- // it seems that almost none of the fonts for Malayalam are set up to handle this.
- // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
-
- if (fPreBaseConsonant == 0x0d31) { // RRA
- fPreBaseConsonant = 0x0d30; // RA
- }
-
- if (fPreBaseConsonant != 0) {
- writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
- writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
- }
- }
-
le_int32 getOutputIndex()
{
@@ -754,5 +723,4 @@
}
-
IndicClassTable::CharClass charClass = CC_RESERVED;
IndicClassTable::CharClass nextClass = CC_RESERVED;
@@ -762,9 +730,7 @@
le_bool seenVattu = FALSE;
le_bool seenBelowBaseForm = FALSE;
- le_bool seenPreBaseForm = FALSE;
le_bool hasNukta = FALSE;
le_bool hasBelowBaseForm = FALSE;
le_bool hasPostBaseForm = FALSE;
- le_bool hasPreBaseForm = FALSE;
if (postBase < markStart && classTable->isNukta(chars[postBase])) {
@@ -780,20 +746,12 @@
hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
- hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
if (IndicClassTable::isConsonant(charClass)) {
if (postBaseLimit == 0 || seenVattu ||
(baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+ !(hasBelowBaseForm || hasPostBaseForm)) {
- !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
break;
}
- // Note any pre-base consonants
- if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
- hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
- output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
- seenPreBaseForm = TRUE;
-
- }
// consonants with nuktas are never vattus
seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
@@ -828,12 +786,10 @@
// write any pre-base consonants
- output.writePreBaseConsonant();
-
le_bool supressVattu = TRUE;
for (i = baseLimit; i < baseConsonant; i += 1) {
LEUnicode ch = chars[i];
+ // Don't put 'blwf' on first consonant.
+ FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
- // Don't put 'pstf' or 'blwf' on anything before the base consonant.
- FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
charClass = classTable->getCharClass(ch);
@@ -886,5 +842,5 @@
// write below-base consonants
+ if (baseConsonant != lastConsonant) {
- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
for (i = bcSpan + 1; i < postBase; i += 1) {
output.writeChar(chars[i], i, tagArray1);
@@ -916,5 +872,5 @@
// write post-base consonants
// FIXME: does this put the right tags on post-base consonants?
+ if (baseConsonant != lastConsonant) {
- if (baseConsonant != lastConsonant && !seenPreBaseForm) {
if (postBase <= lastConsonant) {
for (i = postBase; i <= lastConsonant; i += 1) {
--- misc/build/icu/source/layout/IndicClassTables.cpp 2013-02-19 16:04:09.919412782 +0000
+++ misc/icu/source/layout/IndicClassTables.cpp 2013-02-19 16:04:14.519351601 +0000
@@ -273,7 +273,7 @@
static const IndicClassTable kndaClassTable = {0x0C80, 0x0CEF, 4, KNDA_SCRIPT_FLAGS, kndaCharClasses, kndaSplitTable};
-static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
+static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 4, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
......@@ -327,21 +327,6 @@ File gid_File_Lib_Icui18n
Styles = (PACKED);
End
File gid_File_Lib_Icule
LIB_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT6(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
#else
#ifdef MSVC_PKG_DEBUG_RUNTIME
Name = STRING(CONCAT3(iculed,ICU_MAJOR,.dll));
#else
Name = STRING(CONCAT3(icule,ICU_MAJOR,.dll));
#endif // MSVC_PKG_DEBUG_RUNTIME
#endif
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
File gid_File_Lib_Icuuc
LIB_FILE_BODY;
#ifdef UNX
......
......@@ -176,7 +176,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
gid_File_Lib_Icule,
gid_File_Lib_Icuuc,
gid_File_Lib_Mork,
gid_File_Lib_Mozabdrv,
......
......@@ -43,17 +43,6 @@ Shortcut gid_Shortcut_Lib_Icui18n
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icule
FileID = gid_File_Lib_Icule;
Dir = SCP2_OOO_BIN_DIR;
#ifndef AIX
Name = STRING(CONCAT4(libicule,UNXSUFFIX,.,ICU_MAJOR));
#else
Name = "libicule.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icuuc
FileID = gid_File_Lib_Icuuc;
Dir = SCP2_OOO_BIN_DIR;
......
......@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
$(eval $(call gb_Library_use_externals,desktop_detector,\
boost_headers \
icule \
icuuc \
))
......
......@@ -94,7 +94,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
boost_headers \
gio \
harfbuzz \
icule \
icuuc \
icu_headers \
lcms2 \
......
......@@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
cairo \
graphite \
harfbuzz \
icule \
icuuc \
valgrind \
Xrender \
......
......@@ -67,7 +67,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk,\
gio \
gtk \
gthread \
icule \
icuuc \
))
......
......@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
$(eval $(call gb_Library_use_externals,vclplug_kde,\
boost_headers \
icule \
icuuc \
kde \
))
......
......@@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
$(eval $(call gb_Library_use_externals,vclplug_kde4,\
boost_headers \
icule \
icuuc \
kde4 \
))
......
......@@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
$(eval $(call gb_Library_use_externals,vclplug_svp,\
boost_headers \
freetype_headers \
icule \
icuuc \
))
......
......@@ -57,7 +57,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
$(eval $(call gb_Library_use_externals,vclplug_tde,\
boost_headers \
icule \
icuuc \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment