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

Merge pull request #270 from kiwix/flatpak 

Flatpak bis
This commit is contained in:
Matthieu Gautier 2018-11-30 13:28:18 +01:00 committed by GitHub
parent 5d7972f037 9679c01254
commit 62eb6acd85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -38,7 +38,7 @@ script:
else else
docker build -t kiwix/build -f travis/Dockerfile . docker build -t kiwix/build -f travis/Dockerfile .
fi fi
docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL kiwix/build docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build
else else
travis/compile_all.py travis/compile_all.py
fi fi

2
kiwixbuild/dependencies/aria2.py
View File

@ -23,4 +23,4 @@ class Aria2(Dependency):
class Builder(MakeBuilder): class Builder(MakeBuilder):
dependencies = ['zlib'] dependencies = ['zlib']
configure_option = "--disable-libaria2 --without-sqlite3" configure_option = "--disable-libaria2 --disable-websocket --without-sqlite3"

4
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(' ')
@ -214,6 +214,7 @@ class FlatpakBuilder:
try: try:
with open(log, 'r') as f: with open(log, 'r') as f:
print(f.read()) print(f.read())
raise StopBuild()
except: except:
pass pass
@ -229,6 +230,7 @@ class FlatpakBuilder:
try: try:
with open(log, 'r') as f: with open(log, 'r') as f:
print(f.read()) print(f.read())
raise StopBuild()
except: except:
pass pass

1
kiwixbuild/packages.py
View File

@ -14,6 +14,7 @@ PACKAGE_NAME_MAPPERS = {
'uuid': True, 'uuid': True,
'libxml2': True, 'libxml2': True,
'libssl': True, 'libssl': True,
'libcurl': True,
}, },
'fedora_native_dyn': { 'fedora_native_dyn': {
'COMMON': _fedora_common, 'COMMON': _fedora_common,

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)