From 4f2786a031d32c015de1613e92726a4bdf17d127 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 10 Jan 2019 16:50:36 +0100 Subject: [PATCH 1/2] Add missing import of pj in i586 platform --- kiwixbuild/platforms/i586.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwixbuild/platforms/i586.py b/kiwixbuild/platforms/i586.py index 0dfd677..9a931ed 100644 --- a/kiwixbuild/platforms/i586.py +++ b/kiwixbuild/platforms/i586.py @@ -1,7 +1,7 @@ import os from .base import PlatformInfo -from kiwixbuild.utils import which +from kiwixbuild.utils import which, pj class I586PlatformInfo(PlatformInfo): From f844832c87d58658f9e604c8418b72f3c987e3ec Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 11 Jan 2019 11:28:41 +0100 Subject: [PATCH 2/2] [Appveyor]Add include directory for mustache in kiwix-lib. --- appveyor/install_kiwix-lib.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor/install_kiwix-lib.cmd b/appveyor/install_kiwix-lib.cmd index 42461f1..c0a8b10 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 +set CPPFLAGS="-I%EXTRA_DIR%/include" meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 cd build ninja || exit /b 1