smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'r_10'

This commit is contained in:
Matthieu Gautier 2020-07-15 16:20:16 +02:00
parent 962835b33a 206ed166e0
commit e81a2e7006
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/build_release_nightly.py vendored
View File

@ -43,7 +43,7 @@ elif PLATFORM_TARGET.startswith("native_"):
elif PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim",)
else:
TARGETS = ("zim-tools", "kiwix-tools")
TARGETS = ("zim-tools", "kiwix-lib", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"):
TARGETS = ("kiwix-tools",)
elif PLATFORM_TARGET == "flatpak":

4
appveyor.yml
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.2'
KIWIX_DESKTOP_RELEASE: 0
KIWIX_DESKTOP_VERSION: '2.0.3'
KIWIX_DESKTOP_RELEASE: 1
init:

4
appveyor/install_kiwix-tools.cmd
View File

@ -1,4 +1,4 @@
REM ========================================================
REM Install kiwix-tools
curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-3.1.1-6.zip || exit /b 1
7z e kiwix-tools_win-i686-3.1.1-6.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.2.zip || exit /b 1
7z e kiwix-tools_win-i686-3.1.2.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1

8
kiwixbuild/versions.py
View File

@ -5,7 +5,7 @@ main_project_versions = {
'kiwix-lib': '9.3.0',
'kiwix-tools': '3.1.2', # Also need to change this in appveyor/install_kiwix-tools.cmd
'zim-tools': '1.2.1',
'kiwix-desktop': '2.0.2' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml
'kiwix-desktop': '2.0.3' # 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,10 +31,10 @@ main_project_versions = {
release_versions = {
'libzim': None, # Depends of base deps (was 0)
'kiwix-lib': 0, # Depends of libzim (was 1)
'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 6)
'kiwix-lib': 0, # Depends of libzim (was 0)
'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': None, # Depends of libzim (was 3)
'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0)
'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 0)
}