From 98cd84529edb66624e1fccf10c96a8eea0fa5646 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 30 Aug 2023 17:59:46 +0200 Subject: [PATCH] Use branch cpp17 as default. --- appveyor/install_kiwix-desktop.cmd | 1 + appveyor/install_libkiwix.cmd | 1 + appveyor/install_libzim.cmd | 1 + kiwixbuild/dependencies/base.py | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor/install_kiwix-desktop.cmd b/appveyor/install_kiwix-desktop.cmd index 0d1ee6d..5f4efba 100644 --- a/appveyor/install_kiwix-desktop.cmd +++ b/appveyor/install_kiwix-desktop.cmd @@ -2,6 +2,7 @@ REM ======================================================== REM Install kiwix-desktop git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 cd kiwix-desktop +git checkout cpp17 || exit /b 1 echo "Running qmake" SET _WITH_CONSOLE=1 IF %KIWIX_DESKTOP_RELEASE% EQU 1 ( diff --git a/appveyor/install_libkiwix.cmd b/appveyor/install_libkiwix.cmd index dc357e7..a08f961 100644 --- a/appveyor/install_libkiwix.cmd +++ b/appveyor/install_libkiwix.cmd @@ -2,6 +2,7 @@ REM ======================================================== REM Install libkiwix git clone https://github.com/kiwix/libkiwix.git || exit /b 1 cd libkiwix +git checkout cpp17 || exit /b 1 set CPPFLAGS="-I%EXTRA_DIR%/include" meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 cd build diff --git a/appveyor/install_libzim.cmd b/appveyor/install_libzim.cmd index 18e42d6..474cd59 100644 --- a/appveyor/install_libzim.cmd +++ b/appveyor/install_libzim.cmd @@ -2,6 +2,7 @@ REM ======================================================== REM Install libzim git clone https://github.com/openzim/libzim.git || exit /b 1 cd libzim +git checkout cpp17 || exit /b 1 meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 cd build ninja || exit /b 1 diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 3b5ae2f..6ce24af 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -137,7 +137,7 @@ class ReleaseDownload(Source): class GitClone(Source): - base_git_ref = "main" + base_git_ref = "cpp17" force_full_clone = False @property