From 9ae0f6f7923af148cd41d24403a887cb7faabe15 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 13 Jul 2020 14:56:03 +0200 Subject: [PATCH] Use server branches in kiwix-desktop/kiwix-lib --- appveyor/install_kiwix-desktop.cmd | 1 + appveyor/install_kiwix-lib.cmd | 1 + appveyor/install_libzim.cmd | 1 + 3 files changed, 3 insertions(+) diff --git a/appveyor/install_kiwix-desktop.cmd b/appveyor/install_kiwix-desktop.cmd index 61bea38..89d64a3 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 kiwix-serve echo "Running qmake" SET _WITH_CONSOLE=1 IF %KIWIX_DESKTOP_RELEASE% EQU 1 ( diff --git a/appveyor/install_kiwix-lib.cmd b/appveyor/install_kiwix-lib.cmd index c0a8b10..deee233 100644 --- a/appveyor/install_kiwix-lib.cmd +++ b/appveyor/install_kiwix-lib.cmd @@ -2,6 +2,7 @@ REM ======================================================== REM Install kiwix-lib git clone https://github.com/kiwix/kiwix-lib.git || exit /b 1 cd kiwix-lib +git checkout stop_server 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..ef61fb1 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 fix_win_compilation meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 cd build ninja || exit /b 1