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 #276 from kiwix/update_flatpak 

Update flatpak and new versions
This commit is contained in:
Matthieu Gautier 2018-12-15 13:31:00 +01:00 committed by GitHub
parent c0c907bb92 c776ca9a80
commit e78681dbbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/flatpak_builder.py
View File

@ -26,12 +26,11 @@ import json
from shutil import copyfile from shutil import copyfile
MANIFEST = { MANIFEST = {
'app-id': 'org.kiwix.Client', 'app-id': 'org.kiwix.desktop',
'runtime': 'org.kde.Platform', 'runtime': 'org.kde.Platform',
'runtime-version': '5.11', 'runtime-version': '5.11',
'sdk': 'org.kde.Sdk', 'sdk': 'org.kde.Sdk',
'command': 'kiwix-desktop', 'command': 'kiwix-desktop',
'rename-desktop-file' : 'kiwix-desktop.desktop',
'rename-icon': 'kiwix-desktop', 'rename-icon': 'kiwix-desktop',
'finish-args': [ 'finish-args': [
'--socket=wayland', '--socket=wayland',
@ -40,7 +39,6 @@ MANIFEST = {
'--share=ipc', '--share=ipc',
'--device=dri', '--device=dri',
'--socket=pulseaudio', '--socket=pulseaudio',
'--filesystem=xdg-data',
], ],
'cleanup': [ 'cleanup': [
'/include', '/include',

8
kiwixbuild/versions.py
View File

@ -1,12 +1,12 @@
# This file reference all the versions of the depedencies we use in kiwix-build. # This file reference all the versions of the depedencies we use in kiwix-build.
main_project_versions = { main_project_versions = {
'kiwix-lib': '3.1.0', 'kiwix-lib': '3.1.1',
'kiwix-tools': '0.8.0', 'kiwix-tools': '0.8.0',
'libzim': '4.0.4', 'libzim': '4.0.4',
'zim-tools': '1.0.0', 'zim-tools': '1.0.0',
'zimwriterfs': '1.2', 'zimwriterfs': '1.2',
'kiwix-desktop': '2.0-beta1' 'kiwix-desktop': '2.0-beta2'
} }
# This dictionnary specify what we need to build at each release process. # This dictionnary specify what we need to build at each release process.
@ -26,8 +26,8 @@ main_project_versions = {
release_versions = { release_versions = {
'libzim': None, # Depends of base deps (was 0) 'libzim': None, # Depends of base deps (was 0)
'kiwix-lib': 0, # Depends of libzim 'kiwix-lib': 0, # Depends of libzim
'kiwix-tools': 1, # Depends of kiwix-lib and libzim 'kiwix-tools': 2, # Depends of kiwix-lib and libzim
'zim-tools': None, # Depends of libzim (was 1) 'zim-tools': 2, # Depends of libzim (was 1)
'zimwriterfs': None, # Depends of libzim (was 1) 'zimwriterfs': None, # Depends of libzim (was 1)
'kiwix-desktop': 0 # Depends of kiwix-lib and libzim 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim
} }

4
travis/compile_all.py
View File

@ -115,8 +115,8 @@ 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/'org.kiwix.Client.flatpak' build_path = BASE_DIR/'org.kiwix.desktop.flatpak'
app_name = 'org.kiwix.Client.{}.flatpak'.format(postfix) app_name = 'org.kiwix.desktop.{}.flatpak'.format(postfix)
else: else:
build_path = HOME/'Kiwix-x86_64.AppImage' build_path = HOME/'Kiwix-x86_64.AppImage'
app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix) app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix)