diff options
author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-04-17 12:28:54 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-04-17 10:16:58 +0000 |
commit | b0ee32edafb0226e302bc31d19e4e8fbe9c1ccd0 (patch) | |
tree | a31145a8386fad617ae3febbfad8242bea0ce3a5 /packaging-tools/bld_icu_tools.py | |
parent | 6483ad88bd0000cdd5ace4595eab7d758ed3918b (diff) |
Include correct ICU dll files for final prebuilt ICU archives.
Change-Id: I99f610ca618facc387fe215fcaa246ad40eca08d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'packaging-tools/bld_icu_tools.py')
-rw-r--r-- | packaging-tools/bld_icu_tools.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging-tools/bld_icu_tools.py b/packaging-tools/bld_icu_tools.py index 5debddd9b..26ce0b6bc 100644 --- a/packaging-tools/bld_icu_tools.py +++ b/packaging-tools/bld_icu_tools.py @@ -48,6 +48,7 @@ import os import sys import multiprocessing import shutil +import fnmatch import platform import fileinput from optparse import OptionParser, Option @@ -196,13 +197,13 @@ def clean_icu_lib(lib_path): else: os.remove(item_path) elif plat.startswith('win'): - libs_to_save = ['icudt', 'icuin', 'icuuc'] + libs_to_save = ['icudt??.dll', 'icuin??.dll', 'icuuc??.dll'] file_list = os.listdir(lib_path) for item in file_list: item_path = os.path.join(lib_path, item) if os.path.isdir(item_path): bldinstallercommon.remove_tree(item_path) - elif any(item[:item.index('.')] in s for s in libs_to_save) and item.endswith('.dll'): + elif any(fnmatch.fnmatch(item, p) for p in libs_to_save): continue else: os.remove(item_path) |