From 3d08278a8530dab027c450d7b15b2e597003d410 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 8 Apr 2020 20:42:11 +0200 Subject: [PATCH] New version of kiwix-desktop. --- appveyor.yml | 2 +- appveyor/install_kiwix-tools.cmd | 4 ++-- kiwixbuild/versions.py | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 303e223..8d0d6e3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: MSYS2_ARG_CONV_EXCL: '-Tp' MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.0-rc4' + KIWIX_DESKTOP_VERSION: '2.0' KIWIX_DESKTOP_RELEASE: 1 branches: diff --git a/appveyor/install_kiwix-tools.cmd b/appveyor/install_kiwix-tools.cmd index 0a30f99..d09e2d1 100644 --- a/appveyor/install_kiwix-tools.cmd +++ b/appveyor/install_kiwix-tools.cmd @@ -1,4 +1,4 @@ REM ======================================================== REM Install kiwix-tools -curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-3.0.1-3.zip || exit /b 1 -7z e kiwix-tools_win-i686-3.0.1-3.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1 +curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-3.1.0.zip || exit /b 1 +7z e kiwix-tools_win-i686-3.1.0.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index dedf223..ecfebae 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -6,7 +6,7 @@ main_project_versions = { 'libzim': '6.1.0', 'zim-tools': '1.1.0', 'zimwriterfs': '1.3.9', - 'kiwix-desktop': '2.0-rc4' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml + 'kiwix-desktop': '2.0' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml # You need to do the release process of kiwix-tools and kiwix-desktop in two separated process. } @@ -31,12 +31,12 @@ main_project_versions = { # - set KIWIX_DESKTOP_RELEASE to 0 release_versions = { - 'libzim': 0, # Depends of base deps (was 0) - 'kiwix-lib': 0, # Depends of libzim (was 0) - 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0) - 'zim-tools': 0, # Depends of libzim (was 7) - 'zimwriterfs': 0, # Depends of libzim (was 1) - 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0) + 'libzim': None, # Depends of base deps (was 0) + 'kiwix-lib': None, # Depends of libzim (was 0) + 'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0) + 'zim-tools': None, # Depends of libzim (was 0) + 'zimwriterfs': None, # Depends of libzim (was 0) + 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 0) }