Merge tag '0.0.39'

This commit is contained in:
Matthieu Gautier 2019-09-04 11:08:33 +02:00
commit a7d15bbdb1
2 changed files with 11 additions and 11 deletions

View File

@ -9,8 +9,8 @@ environment:
MSYS2_ARG_CONV_EXCL: '-Tp'
MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c'
MSYSTEM: 'MINGW64'
KIWIX_DESKTOP_VERSION: '2.0-rc1-1'
KIWIX_DESKTOP_RELEASE: 0
KIWIX_DESKTOP_VERSION: '2.0-rc1-2'
KIWIX_DESKTOP_RELEASE: 1
init:
- cmd: |

View File

@ -3,9 +3,9 @@
main_project_versions = {
'kiwix-lib': '6.0.3',
'kiwix-tools': '3.0.1',
'libzim': '5.1.0',
'zim-tools': '1.0.4',
'zimwriterfs': '1.3.5',
'libzim': '6.0.0',
'zim-tools': '1.0.5',
'zimwriterfs': '1.3.6',
'kiwix-desktop': '2.0-rc1' # Also need to be change in appveyor/package_kiwix-desktop.sh
# Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml
}
@ -31,12 +31,12 @@ main_project_versions = {
# - set KIWIX_DESKTOP_RELEASE to 0
release_versions = {
'libzim': None, # Depends of base deps (was 0)
'kiwix-lib': None, # Depends of libzim (was 0)
'kiwix-tools': 2, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': None, # Depends of libzim (was 2)
'zimwriterfs': None, # Depends of libzim (was 2)
'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 1)
'libzim': 0, # Depends of base deps (was 0)
'kiwix-lib': 1, # Depends of libzim (was 0)
'kiwix-tools': 2, # Depends of kiwix-lib and libzim (was 1)
'zim-tools': 0, # Depends of libzim (was 0)
'zimwriterfs': 0, # Depends of libzim (was 0)
'kiwix-desktop': 2 # Depends of kiwix-lib and libzim (was 1)
}