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:
parent
f96ae19c88
commit
92d637ad99
|
@ -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(' ')
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue