diff --git a/.travis.yml b/.travis.yml index 56288e2..f6f924f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,7 @@ env: addons: ssh_known_hosts: - download.kiwix.org + - tmp.kiwix.org - download.openzim.org apt: packages: &common diff --git a/kiwixbuild/dependencies/kiwix_lib.py b/kiwixbuild/dependencies/kiwix_lib.py index 6332394..ea3f8ef 100644 --- a/kiwixbuild/dependencies/kiwix_lib.py +++ b/kiwixbuild/dependencies/kiwix_lib.py @@ -13,6 +13,7 @@ class Kiwixlib(Dependency): class Builder(MesonBuilder): dependencies = ["pugixml", "libzim", "zlib", "lzma", "libcurl", "icu4c", "mustache"] + strip_option = '' @property def configure_option(self): diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index fdcff3a..ed0ea24 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -14,6 +14,7 @@ class Libzim(Dependency): class Builder(MesonBuilder): test_option = "-t 8" dependencies = ['zlib', 'lzma', 'xapian-core', 'icu4c'] + strip_option = '' @property def configure_option(self): diff --git a/kiwixbuild/dependencies/lzma.py b/kiwixbuild/dependencies/lzma.py index 285086e..3d29bdf 100644 --- a/kiwixbuild/dependencies/lzma.py +++ b/kiwixbuild/dependencies/lzma.py @@ -9,9 +9,9 @@ class lzma(Dependency): name = 'lzma' class Source(ReleaseDownload): - archive = Remotefile('xz-5.2.3.tar.bz2', - 'fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1', - 'https://tukaani.org/xz/xz-5.2.3.tar.bz2') + archive = Remotefile('xz-5.2.4.tar.gz', + 'b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145' + ) class Builder(MakeBuilder): @property diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 77e67b9..2f03282 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -35,12 +35,12 @@ 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 = '17' +base_deps_meta_version = '18' base_deps_versions = { 'zlib' : '1.2.8', - 'lzma' : '5.2.3', + 'lzma' : '5.2.4', 'uuid' : '1.43.4', 'xapian-core' : '1.4.10', 'mustache' : '3.2', diff --git a/travis/compile_all.py b/travis/compile_all.py index 4ff6ff8..1c06ce5 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -231,6 +231,8 @@ def make_deps_archive(target, full=False): files_to_archive += HOME.glob('BUILD_*/pugixml-{}'.format( base_deps_versions['pugixml'])) toolchains_subdirs = HOME.glob('**/TOOLCHAINS/*/*') + if PLATFORM.startswith('armhf'): + files_to_archive += [SOURCE_DIR/'raspberrypi-tools'] for subdir in toolchains_subdirs: if not subdir.match('tools'): files_to_archive.append(subdir) @@ -278,10 +280,11 @@ def download_base_archive(base_name): if PLATFORM != 'flatpak': # The first thing we need to do is to (potentially) download already compiled base dependencies. - base_dep_archive_name = "base_deps_{os}_{platform}_{version}.tar.xz".format( + base_dep_archive_name = "base_deps_{os}_{platform}_{version}_{release}.tar.xz".format( os=TRAVIS_OS_NAME, platform=PLATFORM, - version=base_deps_meta_version) + version=base_deps_meta_version, + release='release' if make_release else 'debug') print_message("Getting archive {}", base_dep_archive_name) try: @@ -292,10 +295,11 @@ if PLATFORM != 'flatpak': print_message("Cannot get archive. Build dependencies") if PLATFORM == 'android': for arch in ('arm', 'arm64', 'x86', 'x86_64'): - archive_name = "base_deps_{os}_android_{arch}_{version}.tar.xz".format( + archive_name = "base_deps_{os}_android_{arch}_{version}_{release}.tar.xz".format( os=TRAVIS_OS_NAME, arch=arch, - version=base_deps_meta_version) + version=base_deps_meta_version, + release='release' if make_release else 'debug') print_message("Getting archive {}", archive_name) try: local_filename = download_base_archive(archive_name)