--- appveyor.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml index 86440f0d76a..bdf1ba8388a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,6 +42,9 @@ os: Visual Studio 2015 environment: WINFLEXBISON_ARCHIVE: win_flex_bison-2.5.9.zip LLVM_ARCHIVE: llvm-5.0.1-msvc2015-mtd.7z + matrix: + - BUILD_SYSTEM: meson + - BUILD_SYSTEM: scons install: # Check pip @@ -49,13 +52,16 @@ install: - python -m pip --version # Install Mako - python -m pip install Mako==1.0.6 -# Install pywin32 extensions, needed by SCons -- python -m pip install pypiwin32 -# Install python wheels, necessary to install SCons via pip -- python -m pip install wheel -# Install SCons -- python -m pip install scons==2.5.1 -- scons --version +- if "%BUILD_SYSTEM%"=="scons" python -m pip install pypiwin32 wheel +- if "%BUILD_SYSTEM%"=="scons" python -m pip install scons==2.5.1 +- if "%BUILD_SYSTEM%"=="scons" scons --version +- if "%BUILD_SYSTEM%"=="meson" C:\Python36\python.exe -m pip install meson +- if "%BUILD_SYSTEM%"=="meson" set Path=C:\Python36\Scripts;%Path% +- if "%BUILD_SYSTEM%"=="meson" set Path=C:\Python27;%Path% +- if "%BUILD_SYSTEM%"=="meson" meson.py --version +- if "%BUILD_SYSTEM%"=="meson" cinst -y ninja pkgconfiglite +- if "%BUILD_SYSTEM%"=="meson" ninja --version +- if "%BUILD_SYSTEM%"=="meson" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 # Install flex/bison - if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://downloads.sourceforge.net/project/winflexbison/old_versions/%WINFLEXBISON_ARCHIVE%" - 7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul @@ -69,10 +75,14 @@ install: - set LLVM=%CD%\llvm build_script: -- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.0 llvm=1 +- if "%BUILD_SYSTEM%"=="scons" scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.0 llvm=1 +- if "%BUILD_SYSTEM%"=="meson" meson builddir -Dbuild-tests=true +- if "%BUILD_SYSTEM%"=="meson" ninja -C builddir after_build: -- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.0 llvm=1 check +- if "%BUILD_SYSTEM%"=="scons" scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.0 llvm=1 check +# Doesn't work yet, a large number of tests fail +#- if "%BUILD_SYSTEM%"=="meson" ninja -C builddir test # It's possible to setup notification here, as described in -- 2.18.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev