diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-21 10:39:06 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-21 10:39:23 +0200 |
| commit | e860c78e2390c8d4e924411ac41e045d2a1c3968 (patch) | |
| tree | c505c822a3a672efc596106294f75b6db6541562 | |
| parent | 14785648d5534855a0c7f322aa97a7b58a4cb3a8 (diff) | |
Use subset of ICU data in a bundled ICU
Change-Id: I71673271ec3e10d16f17f5640cbf6a90a1bfb9f4
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 | ||||
| -rw-r--r-- | ooo.lst.in | 1 |
4 files changed, 17 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 727bdc7f04b2..6b3abda42159 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -284,6 +284,7 @@ export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITION export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@ export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@ export ICU_TARBALL=@ICU_TARBALL@ +export ICU_DATA_SUBSET_ZIP=@ICU_DATA_SUBSET_ZIP@ export ILIB=@ILIB@ export INPATH=@INPATH@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ diff --git a/configure.ac b/configure.ac index a121719b5e28..2f1668218a9b 100644 --- a/configure.ac +++ b/configure.ac @@ -8501,6 +8501,17 @@ else AC_MSG_RESULT([internal]) SYSTEM_ICU="NO" ICU_TARBALL="7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz" + + # Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by + # the interactive web tool at http://apps.icu-project.org/datacustom/ICUData49.html by dropping + # the "Charset Mapping Tables". Probably we could carefully cherry-pick other items in the data to + # be dropped, too. A bit tedious using that web tool, though. + + # If you do that, upload a new subset data zip file with just the MD5 part of the name changed + # appropriately. Let's not bother trying to list what stuff has been removed in the file name. + # Describe it in the comment above instead. + ICU_DATA_SUBSET_ZIP=fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip + BUILD_TYPE="$BUILD_TYPE ICU" fi @@ -8516,6 +8527,7 @@ AC_SUBST([ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER]) AC_SUBST([ICU_RECLASSIFIED_HEBREW_LETTER]) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) AC_SUBST(ICU_TARBALL) +AC_SUBST(ICU_DATA_SUBSET_ZIP) AC_SUBST([MINGW_ICUDATA_DLL]) AC_SUBST([MINGW_ICUI18N_DLL]) AC_SUBST([MINGW_ICUUC_DLL]) diff --git a/icu/makefile.mk b/icu/makefile.mk index 01695cce18ea..5066ef0a17b7 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -77,6 +77,8 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=1 EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0 .ENDIF +CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in && + .IF "$(GUI)"=="UNX" .IF "$(SYSBASE)"!="" @@ -276,7 +278,7 @@ OUT2BIN= \ .ELSE BUILD_DIR=source -CONFIGURE_ACTION=bash ./runConfigureICU Cygwin/MSVC +CONFIGURE_ACTION+=bash ./runConfigureICU Cygwin/MSVC BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB= \ diff --git a/ooo.lst.in b/ooo.lst.in index 5757b7b074a1..4f7596cf3ed0 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -38,6 +38,7 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz @HUNSPELL_TARBALL@ @HYPHEN_TARBALL@ @ICU_TARBALL@ +@ICU_DATA_SUBSET_ZIP@ @JFREEREPORT_FLOW_ENGINE_TARBALL@ @JFREEREPORT_FLUTE_TARBALL@ @JFREEREPORT_LIBBASE_TARBALL@ |