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

Add an option to allways check for needed system packages.

This commit is contained in:
Matthieu Gautier 2018-04-19 10:33:33 +02:00
parent 1773f0fa28
commit 2270a070d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/__init__.py
View File

@ -580,7 +580,7 @@ class BuildEnv:
packages = getattr(dep, 'extra_packages', []) packages = getattr(dep, 'extra_packages', [])
for package in packages: for package in packages:
packages_list += package_name_mapper.get(package, []) packages_list += package_name_mapper.get(package, [])
if os.path.exists(autoskip_file): if not self.options.force_install_packages and os.path.exists(autoskip_file):
print("SKIP") print("SKIP")
return return
@ -758,6 +758,8 @@ def parse_args():
help="Skip SSL certificate verification during download") help="Skip SSL certificate verification during download")
subgroup.add_argument('--clean-at-end', action='store_true', subgroup.add_argument('--clean-at-end', action='store_true',
help="Clean all intermediate files after the (successfull) build") help="Clean all intermediate files after the (successfull) build")
subgroup.add_argument('--force-install-packages', action='store_true',
help="Allways check for needed packages before compiling")
subgroup = parser.add_argument_group('custom app', subgroup = parser.add_argument_group('custom app',
description="Android custom app specific options") description="Android custom app specific options")
subgroup.add_argument('--android-custom-app', subgroup.add_argument('--android-custom-app',

2
travis/compile_all.py
View File

@ -59,6 +59,7 @@ def run_kiwix_build(target, platform, build_deps_only=False, make_release=False,
command = ['kiwix-build'] command = ['kiwix-build']
command.append(target) command.append(target)
command.append('--hide-progress') command.append('--hide-progress')
command.append('--force-install-packages')
command.extend(['--target-platform', platform]) command.extend(['--target-platform', platform])
if build_deps_only: if build_deps_only:
command.append('--build-deps-only') command.append('--build-deps-only')
@ -230,7 +231,6 @@ for target in TARGETS:
platform=PLATFORM, platform=PLATFORM,
make_release=True, make_release=True,
make_dist=True) make_dist=True)
(BASE_DIR/'.install_packages_ok').unlink()
# We have build everything. Now create archives for public deployement. # We have build everything. Now create archives for public deployement.