diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index b4ea4aa..77e67b9 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -1,8 +1,8 @@ # This file reference all the versions of the depedencies we use in kiwix-build. main_project_versions = { - 'kiwix-lib': '4.0.0', - 'kiwix-tools': '0.9.0', + 'kiwix-lib': '4.0.1', + 'kiwix-tools': '1.0.0', 'libzim': '4.0.5', 'zim-tools': '1.0.0', 'zimwriterfs': '1.2', @@ -25,8 +25,8 @@ main_project_versions = { release_versions = { 'libzim': 0, # Depends of base deps (was 0) - 'kiwix-lib': 1, # Depends of libzim (was 0) - 'kiwix-tools': 1, # Depends of kiwix-lib and libzim (was 0) + 'kiwix-lib': 0, # Depends of libzim (was 0) + 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0) 'zim-tools': 3, # Depends of libzim (was 2) 'zimwriterfs': 2, # Depends of libzim (was 1) 'kiwix-desktop': 1 # Depends of kiwix-lib and libzim diff --git a/travis/compile_all.py b/travis/compile_all.py index ca5ec22..4ff6ff8 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -51,7 +51,7 @@ EXPORT_FILES = { '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]), - 'include/zim/*.h')) + 'include/zim/**/*.h')) } _date = date.today().isoformat() @@ -127,12 +127,14 @@ def create_desktop_image(): build_path = BASE_DIR/'org.kiwix.desktop.flatpak' app_name = 'org.kiwix.desktop.{}.flatpak'.format(postfix) 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) command = ['kiwix-build/scripts/create_kiwix-desktop_appImage.sh', str(INSTALL_DIR), str(src_dir), str(HOME/'AppDir')] + env = dict(os.environ) + env['VERSION'] = postfix print_message("Build AppImage of kiwix-desktop") - subprocess.check_call(command, cwd=str(HOME)) + subprocess.check_call(command, cwd=str(HOME), env=env) try: archive_dir.mkdir(parents=True)