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

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.
This commit is contained in:
Matthieu Gautier 2018-11-29 11:42:28 +01:00
parent f96ae19c88
commit 92d637ad99
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/flatpak_builder.py
View File

@ -181,7 +181,7 @@ class FlatpakBuilder:
elif isinstance(builder, QMakeBuilder): elif isinstance(builder, QMakeBuilder):
module['buildsystem'] = 'qmake' module['buildsystem'] = 'qmake'
# config-opts # config-opts
print(builder) print(module['name'])
if getattr(builder, 'configure_option', ''): if getattr(builder, 'configure_option', ''):
module['config-opts'] = builder.configure_option.split(' ') module['config-opts'] = builder.configure_option.split(' ')

4
travis/compile_all.py
View File

@ -115,7 +115,7 @@ def create_desktop_image():
src_dir = SOURCE_DIR/'kiwix-desktop' src_dir = SOURCE_DIR/'kiwix-desktop'
if PLATFORM == 'flatpak': 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) app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix)
else: else:
build_path = HOME/'Kiwix-x86_64.AppImage' build_path = HOME/'Kiwix-x86_64.AppImage'
@ -335,7 +335,7 @@ else:
TARGETS = ('libzim', 'zim-tools', 'kiwix-lib', 'kiwix-tools') TARGETS = ('libzim', 'zim-tools', 'kiwix-lib', 'kiwix-tools')
for target in TARGETS: 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, run_kiwix_build(target,
platform=PLATFORM, platform=PLATFORM,
build_deps_only=True) build_deps_only=True)