From 92d637ad994e19b23718cc8f99401211627254d5 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 29 Nov 2018 11:42:28 +0100 Subject: [PATCH] Better flatpak build. - Print the name of the module instead of the builder. - Do not try to build the kiwix-desktop dependencies in the flatpak. - Correct the path of the created flatpak. --- kiwixbuild/flatpak_builder.py | 2 +- travis/compile_all.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py index 4f44a61..1ff6f05 100644 --- a/kiwixbuild/flatpak_builder.py +++ b/kiwixbuild/flatpak_builder.py @@ -181,7 +181,7 @@ class FlatpakBuilder: elif isinstance(builder, QMakeBuilder): module['buildsystem'] = 'qmake' # config-opts - print(builder) + print(module['name']) if getattr(builder, 'configure_option', ''): module['config-opts'] = builder.configure_option.split(' ') diff --git a/travis/compile_all.py b/travis/compile_all.py index 3ba00b9..8a184f1 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -115,7 +115,7 @@ def create_desktop_image(): src_dir = SOURCE_DIR/'kiwix-desktop' if PLATFORM == 'flatpak': - build_path = BASE_DIR/'BUILD_flatpak'/'org.kiwix.Client.flatpak' + build_path = BASE_DIR/'org.kiwix.Client.flatpak' app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix) else: build_path = HOME/'Kiwix-x86_64.AppImage' @@ -335,7 +335,7 @@ else: TARGETS = ('libzim', 'zim-tools', 'kiwix-lib', 'kiwix-tools') for target in TARGETS: - if environ['TRAVIS_EVENT_TYPE'] == 'cron' and PLATFORM != 'android': + if environ['TRAVIS_EVENT_TYPE'] == 'cron' and PLATFORM not in ('android', 'flatpak'): run_kiwix_build(target, platform=PLATFORM, build_deps_only=True)