smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use specific release base deps archive when build release. 

Base deps are not compiled the same between a release and debug build.
This commit is contained in:
Matthieu Gautier 2019-03-04 14:09:50 +01:00
parent 1341c8b401
commit e04dd76ee0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
travis/compile_all.py
View File

@ -278,10 +278,11 @@ def download_base_archive(base_name):
if PLATFORM != 'flatpak': if PLATFORM != 'flatpak':
# The first thing we need to do is to (potentially) download already compiled base dependencies. # 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, os=TRAVIS_OS_NAME,
platform=PLATFORM, 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) print_message("Getting archive {}", base_dep_archive_name)
try: try:
@ -292,10 +293,11 @@ if PLATFORM != 'flatpak':
print_message("Cannot get archive. Build dependencies") print_message("Cannot get archive. Build dependencies")
if PLATFORM == 'android': if PLATFORM == 'android':
for arch in ('arm', 'arm64', 'x86', 'x86_64'): 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, os=TRAVIS_OS_NAME,
arch=arch, 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) print_message("Getting archive {}", archive_name)
try: try:
local_filename = download_base_archive(archive_name) local_filename = download_base_archive(archive_name)