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

Use branch cpp17 as default.

This commit is contained in:
Matthieu Gautier 2023-08-30 17:59:46 +02:00
parent 4dfae35d8a
commit 98cd84529e
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor/install_kiwix-desktop.cmd
View File

@ -2,6 +2,7 @@ REM ========================================================
REM Install kiwix-desktop REM Install kiwix-desktop
git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 git clone https://github.com/kiwix/kiwix-desktop || exit /b 1
cd kiwix-desktop cd kiwix-desktop
git checkout cpp17 || exit /b 1
echo "Running qmake" echo "Running qmake"
SET _WITH_CONSOLE=1 SET _WITH_CONSOLE=1
IF %KIWIX_DESKTOP_RELEASE% EQU 1 ( IF %KIWIX_DESKTOP_RELEASE% EQU 1 (

1
appveyor/install_libkiwix.cmd
View File

@ -2,6 +2,7 @@ REM ========================================================
REM Install libkiwix REM Install libkiwix
git clone https://github.com/kiwix/libkiwix.git || exit /b 1 git clone https://github.com/kiwix/libkiwix.git || exit /b 1
cd libkiwix cd libkiwix
git checkout cpp17 || exit /b 1
set CPPFLAGS="-I%EXTRA_DIR%/include" set CPPFLAGS="-I%EXTRA_DIR%/include"
meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1
cd build cd build

1
appveyor/install_libzim.cmd
View File

@ -2,6 +2,7 @@ REM ========================================================
REM Install libzim REM Install libzim
git clone https://github.com/openzim/libzim.git || exit /b 1 git clone https://github.com/openzim/libzim.git || exit /b 1
cd libzim cd libzim
git checkout cpp17 || exit /b 1
meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1
cd build cd build
ninja || exit /b 1 ninja || exit /b 1

2
kiwixbuild/dependencies/base.py
View File

@ -137,7 +137,7 @@ class ReleaseDownload(Source):
class GitClone(Source): class GitClone(Source):
base_git_ref = "main" base_git_ref = "cpp17"
force_full_clone = False force_full_clone = False
@property @property