Fix creation of base dependencies archive.
The `INSTALL_DIR` was added twice. It was not a issue as we then transform the list into a set to remove duplicated. But with `filter_install_dir` call only on one "add", the (textual) entries are not duplicated and so, not removed. So the files where add twice. Now we correctly filter initial `INSTALL_DIR` and we remove the second add.
This commit is contained in:
parent
e77442b9a9
commit
7a23bb5b8b
|
@ -276,14 +276,13 @@ def make_deps_archive(target=None, name=None, full=False):
|
|||
OS_NAME, PLATFORM_TARGET, target
|
||||
)
|
||||
print_message("Create archive {}.", archive_name)
|
||||
files_to_archive = [INSTALL_DIR]
|
||||
files_to_archive = list(filter_install_dir(INSTALL_DIR))
|
||||
files_to_archive += HOME.glob("BUILD_*/LOGS")
|
||||
if PLATFORM_TARGET == "native_mixed":
|
||||
files_to_archive += filter_install_dir(HOME / "BUILD_native_static" / "INSTALL")
|
||||
if PLATFORM_TARGET.startswith("android_"):
|
||||
files_to_archive += filter_install_dir(HOME / "BUILD_neutral" / "INSTALL")
|
||||
base_dir = HOME / "BUILD_{}".format(PLATFORM_TARGET)
|
||||
files_to_archive += filter_install_dir(base_dir / "INSTALL")
|
||||
if (base_dir / "meson_cross_file.txt").exists():
|
||||
files_to_archive.append(base_dir / "meson_cross_file.txt")
|
||||
files_to_archive += HOME.glob("BUILD_*/android-ndk*")
|
||||
|
|
|
@ -39,7 +39,7 @@ release_versions = {
|
|||
|
||||
# This is the "version" of the whole base_deps_versions dict.
|
||||
# Change this when you change base_deps_versions.
|
||||
base_deps_meta_version = '81'
|
||||
base_deps_meta_version = '82'
|
||||
|
||||
base_deps_versions = {
|
||||
'zlib' : '1.2.12',
|
||||
|
|
Loading…
Reference in New Issue