Add more dependencies is base dependencies on Windows

This commit is contained in:
Matthieu Gautier 2024-08-23 18:07:50 +02:00
parent 45ad41724c
commit d8b4d24d7f
2 changed files with 44 additions and 26 deletions

View File

@ -13,32 +13,50 @@ class AllBaseDependencies(Dependency):
class Builder(NoopBuilder): class Builder(NoopBuilder):
@classmethod @classmethod
def get_dependencies(cls, configInfo, allDeps): def get_dependencies(cls, configInfo, allDeps):
if neutralEnv("distname") == "Windows":
return ["zlib", "zstd", "icu4c", "zim-testing-suite", "xapian-core"]
if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux": if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux":
return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"] return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"]
base_deps = [ if neutralEnv("distname") == "Windows":
"zlib", base_deps = [
"lzma", "zlib",
"zstd", "zstd",
"xapian-core", "xapian-core",
"pugixml", "zim-testing-suite",
"libcurl", "icu4c",
"icu4c", ]
"mustache",
"libmicrohttpd", if not configInfo.name.endswith("_dyn"):
"zim-testing-suite", base_deps += [
] "pugixml",
# Add specific dependencies depending of the config "libcurl",
if configInfo.build not in ("android", "iOS"): "mustache",
# For zimtools "libmicrohttpd",
base_deps += ["docoptcpp"] ]
if configInfo.build != "win32": else:
# zimwriterfs base_deps = [
base_deps += ["libmagic", "gumbo"] "zlib",
if configInfo.build == "native" and neutralEnv("distname") != "Darwin": "lzma",
# We compile kiwix-desktop only on native and not on `Darwin` "zstd",
# So we need aria2 only there "xapian-core",
base_deps += ["aria2"] "pugixml",
"libcurl",
"icu4c",
"mustache",
"libmicrohttpd",
"zim-testing-suite",
]
# Add specific dependencies depending of the config
if configInfo.build not in ("android", "iOS"):
# For zimtools
base_deps += ["docoptcpp"]
if configInfo.build != "win32":
# zimwriterfs
base_deps += ["libmagic", "gumbo"]
if (
configInfo.build == "native"
and neutralEnv("distname") != "Darwin"
):
# We compile kiwix-desktop only on native and not on `Darwin`
# So we need aria2 only there
base_deps += ["aria2"]
return base_deps return base_deps

View File

@ -39,7 +39,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = "04" base_deps_meta_version = "05"
base_deps_versions = { base_deps_versions = {
"zlib": "1.2.12", "zlib": "1.2.12",