Add an option `--asume-packages-installed` to not try to install packages.

This is different than `--dont-install-packages` that will try to
compile the dependencies.

`--asumme-packages-installed` will no try to install packages, but will
not try either to compile dependencies.
This commit is contained in:
Matthieu Gautier 2018-11-27 15:12:07 +01:00
parent 086361b432
commit ecf3b8b1ff
3 changed files with 8 additions and 0 deletions

View File

@ -38,6 +38,8 @@ def parse_args():
help="Clean all intermediate files after the (successfull) build")
subgroup.add_argument('--dont-install-packages', action='store_true',
help="Do not try to install packages before compiling")
subgroup.add_argument('--assume-packages-installed', action='store_true',
help="Assume the package to install to be aleady installed")
subgroup.add_argument('--android-arch', action='append',
help=("Specify the architecture to build for android application/libraries.\n"
"Can be specified several times to build for several architectures.\n"

View File

@ -149,6 +149,10 @@ class Builder:
packages_to_have = self._get_packages()
packages_to_have = remove_duplicates(packages_to_have)
if option('assume_packages_installed'):
print("SKIP, Assume package installed")
return
distname = neutralEnv('distname')
if distname in ('fedora', 'redhat', 'centos'):
package_installer = 'sudo dnf install {}'

View File

@ -75,6 +75,8 @@ def run_kiwix_build(target, platform,
command = ['kiwix-build']
command.append(target)
command.append('--hide-progress')
if platform == 'flatpak':
command.append('--assume-packages-installed')
if target == 'kiwix-android' and platform.startswith('android_'):
command.extend(['--target-platform', 'android', '--android-arch', platform[8:]])
elif platform == 'android':