diff --git a/kiwixbuild/dependencies/__init__.py b/kiwixbuild/dependencies/__init__.py index 3558c53..f6ea52d 100644 --- a/kiwixbuild/dependencies/__init__.py +++ b/kiwixbuild/dependencies/__init__.py @@ -25,6 +25,7 @@ from . import ( uuid, xapian, zim_tools, + zim_testing_suite, zlib, zstd ) diff --git a/kiwixbuild/dependencies/all_dependencies.py b/kiwixbuild/dependencies/all_dependencies.py index 45dacef..feabe5a 100644 --- a/kiwixbuild/dependencies/all_dependencies.py +++ b/kiwixbuild/dependencies/all_dependencies.py @@ -12,7 +12,7 @@ class AllBaseDependencies(Dependency): class Builder(NoopBuilder): @classmethod def get_dependencies(cls, platformInfo, allDeps): - base_deps = ['zlib', 'lzma', 'zstd', 'xapian-core', 'pugixml', 'libcurl', 'icu4c', 'mustache', 'libmicrohttpd'] + base_deps = ['zlib', 'lzma', 'zstd', 'xapian-core', 'pugixml', 'libcurl', 'icu4c', 'mustache', 'libmicrohttpd', 'zim-testing-suite'] # zimtools # We do not build zimtools at all on "android" and "iOS" if platformInfo.build not in ('android', 'iOS'): diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index 8640d2f..f0b8904 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -14,7 +14,7 @@ class Libzim(Dependency): class Builder(MesonBuilder): test_option = "-t 8" - dependencies = ['lzma', 'zstd', 'xapian-core', 'icu4c'] + dependencies = ['lzma', 'zstd', 'xapian-core', 'icu4c', 'zim-testing-suite'] strip_option = '' @property diff --git a/kiwixbuild/dependencies/zim_testing_suite.py b/kiwixbuild/dependencies/zim_testing_suite.py new file mode 100644 index 0000000..7742e56 --- /dev/null +++ b/kiwixbuild/dependencies/zim_testing_suite.py @@ -0,0 +1,19 @@ +from .base import ( + Dependency, + ReleaseDownload, + NoopBuilder +) + +from kiwixbuild.utils import Remotefile + + +class ZimTestingSuite(Dependency): + name = "zim-testing-suite" + dont_skip = True + + class Source(ReleaseDownload): + archive = Remotefile('zim-testing-suite-0.2.tar.gz', + '04a6db258a48a09ebf25fdf5856029f11269190467b46d54e02c26f2236e2b32', + 'https://github.com/openzim/zim-testing-suite/releases/download/v0.2/zim-testing-suite-0.2.tar.gz') + + Builder = NoopBuilder diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 038fb6e..23cd473 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -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 = '71' +base_deps_meta_version = '72' base_deps_versions = { 'zlib' : '1.2.8', @@ -60,4 +60,5 @@ base_deps_versions = { 'qt' : '5.10.1', 'qtwebengine' : '5.10.1', 'org.kde' : '5.12', + 'zim-testing-suite': '0.2', }