From 7963fd464a7fbe8e611727864b5ec596cbe2e53c Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 23 Oct 2018 14:18:07 +0200 Subject: [PATCH] [AppVeyor] Update to last version of meson Last version of meson (0.48.0) install meson a differently on Windows. Now, a `meson.exe` is installed, so, we must launch `meson` instead of `meson.py`. --- appveyor/install_kiwix-lib.cmd | 2 +- appveyor/install_libzim.cmd | 2 +- appveyor/install_pugixml.cmd | 2 +- appveyor/install_zlib.cmd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor/install_kiwix-lib.cmd b/appveyor/install_kiwix-lib.cmd index afbe3bf..42461f1 100644 --- a/appveyor/install_kiwix-lib.cmd +++ b/appveyor/install_kiwix-lib.cmd @@ -2,7 +2,7 @@ REM ======================================================== REM Install kiwix-lib git clone https://github.com/kiwix/kiwix-lib.git || exit /b 1 cd kiwix-lib -meson.py . 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 ninja || exit /b 1 ninja install || exit /b 1 diff --git a/appveyor/install_libzim.cmd b/appveyor/install_libzim.cmd index 4fe5e41..18e42d6 100644 --- a/appveyor/install_libzim.cmd +++ b/appveyor/install_libzim.cmd @@ -2,7 +2,7 @@ REM ======================================================== REM Install libzim git clone https://github.com/openzim/libzim.git || exit /b 1 cd libzim -meson.py . 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 ninja || exit /b 1 ninja install || exit /b 1 diff --git a/appveyor/install_pugixml.cmd b/appveyor/install_pugixml.cmd index 8b38374..e005d91 100644 --- a/appveyor/install_pugixml.cmd +++ b/appveyor/install_pugixml.cmd @@ -3,7 +3,7 @@ REM Install pugixml curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/pugixml-1.2-meson.zip || exit /b 1 7z x pugixml-1.2-meson.zip -o. || exit /b 1 cd pugixml-1.2-meson -meson.py . 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 ninja || exit /b 1 ninja install || exit /b 1 diff --git a/appveyor/install_zlib.cmd b/appveyor/install_zlib.cmd index 31ab3ed..2e1a00b 100644 --- a/appveyor/install_zlib.cmd +++ b/appveyor/install_zlib.cmd @@ -3,7 +3,7 @@ REM Install zlib curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/zlib-1.2.11.meson.zip || exit /b 1 7z x zlib-1.2.11.meson.zip || exit /b 1 cd zlib-1.2.11 -meson.py . 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 ninja || exit /b 1 ninja install || exit /b 1