diff options
| author | Job Bautista <jobbautista9@aol.com> | 2023-03-19 10:55:00 +0800 |
|---|---|---|
| committer | Job Bautista <jobbautista9@aol.com> | 2023-03-19 10:55:00 +0800 |
| commit | 0c63f5a27346875dd04c8bb41eced35203d20567 (patch) | |
| tree | 8e5c74c92a193d1803507e29c8010c7b54ec2542 /config/external/icu | |
| parent | eac34369607620a9c80e0472a627ae8a7ec095be (diff) | |
| download | uxp-0c63f5a27346875dd04c8bb41eced35203d20567.tar.gz | |
Issue #2165 - Follow-up: No longer support bundling the ICU data file into packaging, fold it into the ICU shared library, and always build ICU shared.
This removes two variables in the build system: MOZ_ICU_DATA_ARCHIVE and
MOZ_SHARED_ICU.
Per discussion in PR #2164, it's now preferred to fold the ICU data into the new
shared library.
This effectively means --enable-shared-icu is no longer a thing. UXP apps must
update their packaging manifest to avoid breakage.
Diffstat (limited to 'config/external/icu')
| -rw-r--r-- | config/external/icu/data/moz.build | 9 | ||||
| -rw-r--r-- | config/external/icu/moz.build | 10 | ||||
| -rw-r--r-- | config/external/icu/stubdata/moz.build | 12 |
3 files changed, 5 insertions, 26 deletions
diff --git a/config/external/icu/data/moz.build b/config/external/icu/data/moz.build index 90b1fd7a19..e41bf45c14 100644 --- a/config/external/icu/data/moz.build +++ b/config/external/icu/data/moz.build @@ -3,13 +3,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_ICU_DATA_ARCHIVE']: - # Copy the pre-built ICU data file to dist/bin. - FINAL_TARGET_FILES += [CONFIG['ICU_DATA_FILE']] - -# Build a library containing the ICU data for use in the JS shell, so that -# JSAPI consumers don't have to deal with setting ICU's data path. +# Build a library containing the ICU data and fold it into the shared +# ICU library. Library('icudata') +FINAL_LIBRARY = 'icu' if CONFIG['OS_ARCH'] == 'WINNT': if CONFIG['CPU_ARCH'] == 'x86': diff --git a/config/external/icu/moz.build b/config/external/icu/moz.build index e403f17c78..79c879f219 100644 --- a/config/external/icu/moz.build +++ b/config/external/icu/moz.build @@ -9,11 +9,5 @@ DIRS += [ 'i18n', ] -if CONFIG['MOZ_ICU_DATA_ARCHIVE']: - DIRS += ['stubdata'] - USE_LIBS += ['icustubdata'] - Library('icu') -else: - USE_LIBS += ['icudata'] - SharedLibrary('icu') - SHARED_LIBRARY_NAME = 'icu' + CONFIG['MOZ_ICU_VERSION'] +SharedLibrary('icu') +SHARED_LIBRARY_NAME = 'icu' + CONFIG['MOZ_ICU_VERSION'] diff --git a/config/external/icu/stubdata/moz.build b/config/external/icu/stubdata/moz.build deleted file mode 100644 index 84c7f082d9..0000000000 --- a/config/external/icu/stubdata/moz.build +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# This builds the ICU stubdata library, since we are shipping ICU -# data in a separate data file. ICU needs a data symbol to link against -# even if you're loading its data from a file. - -Library('icustubdata') - -SOURCES += ['/intl/icu/source/stubdata/stubdata.cpp'] |