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 #300 from kiwix/new_release 

New release
This commit is contained in:
Matthieu Gautier 2019-02-22 11:51:44 +01:00 committed by GitHub
parent 884c9368fb 70fff445c0
commit d31d9985c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwixbuild/versions.py
View File

@ -1,8 +1,8 @@
# 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': '4.0.0', 'kiwix-lib': '4.0.1',
'kiwix-tools': '0.9.0', 'kiwix-tools': '1.0.0',
'libzim': '4.0.5', 'libzim': '4.0.5',
'zim-tools': '1.0.0', 'zim-tools': '1.0.0',
'zimwriterfs': '1.2', 'zimwriterfs': '1.2',
@ -25,8 +25,8 @@ main_project_versions = {
release_versions = { release_versions = {
'libzim': 0, # Depends of base deps (was 0) 'libzim': 0, # Depends of base deps (was 0)
'kiwix-lib': 1, # Depends of libzim (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0)
'kiwix-tools': 1, # Depends of kiwix-lib and libzim (was 0) 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': 3, # Depends of libzim (was 2) 'zim-tools': 3, # Depends of libzim (was 2)
'zimwriterfs': 2, # Depends of libzim (was 1) 'zimwriterfs': 2, # Depends of libzim (was 1)
'kiwix-desktop': 1 # Depends of kiwix-lib and libzim 'kiwix-desktop': 1 # Depends of kiwix-lib and libzim

8
travis/compile_all.py
View File

@ -51,7 +51,7 @@ EXPORT_FILES = {
'libzim': 'libzim':
(INSTALL_DIR, ('lib/x86_64-linux-gnu/libzim.so.{}'.format(main_project_versions['libzim']), (INSTALL_DIR, ('lib/x86_64-linux-gnu/libzim.so.{}'.format(main_project_versions['libzim']),
'lib/x86_64-linux-gnu/libzim.so.{}'.format(main_project_versions['libzim'][0]), 'lib/x86_64-linux-gnu/libzim.so.{}'.format(main_project_versions['libzim'][0]),
'include/zim/*.h')) 'include/zim/**/*.h'))
} }
_date = date.today().isoformat() _date = date.today().isoformat()
@ -127,12 +127,14 @@ def create_desktop_image():
build_path = BASE_DIR/'org.kiwix.desktop.flatpak' build_path = BASE_DIR/'org.kiwix.desktop.flatpak'
app_name = 'org.kiwix.desktop.{}.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'.format(postfix)
app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix) app_name = "kiwix-desktop_x86_64_{}.appimage".format(postfix)
command = ['kiwix-build/scripts/create_kiwix-desktop_appImage.sh', command = ['kiwix-build/scripts/create_kiwix-desktop_appImage.sh',
str(INSTALL_DIR), str(src_dir), str(HOME/'AppDir')] str(INSTALL_DIR), str(src_dir), str(HOME/'AppDir')]
env = dict(os.environ)
env['VERSION'] = postfix
print_message("Build AppImage of kiwix-desktop") print_message("Build AppImage of kiwix-desktop")
subprocess.check_call(command, cwd=str(HOME)) subprocess.check_call(command, cwd=str(HOME), env=env)
try: try:
archive_dir.mkdir(parents=True) archive_dir.mkdir(parents=True)