[Mesa-dev] [PATCH 46/48] appveyor: Add support for meson as well as scons
Dylan Baker
dylan at pnwbakers.com
Tue Jun 12 17:50:15 UTC 2018
Quoting Eric Engestrom (2018-06-12 04:46:19)
> On Monday, 2018-06-11 15:56:13 -0700, Dylan Baker wrote:
> > This currently builds softpipe only
> > ---
> > appveyor.yml | 28 +++++++++++++++++++---------
> > 1 file changed, 19 insertions(+), 9 deletions(-)
> >
> > diff --git a/appveyor.yml b/appveyor.yml
> > index bd33e2e9554..06063feba93 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-3.3.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
>
> I think this is gonna be more readable if you use `()`:
>
> if %BS%==scons (
> foo
> bar
> baz
> ...
> )
I cannot get appveyor to accept anything like that. I know it's valid CMD, but
appveyor's yaml parser is a bit odd, and I can't figure out how to get it to
take multi-line cmd. When I went to stack overflow I found a bunch of questions
about it, but the only answer seems to be "use powershell" or reference an
external file. I'm very against the latter, and others have objected to
powershell in the past.
Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180612/4e013a74/attachment.sig>
More information about the mesa-dev
mailing list