diff options
| author | Joergen Ibsen <ji@ibse.dk> | 2017-11-20 09:18:11 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-20 23:07:07 +0200 |
| commit | d5a6ab31bfbcec9838805c598be75abb036aff87 (patch) | |
| tree | faf5a3be84415e6a67c4ca65bee2e0ed201f1227 | |
| parent | eba69723064325a8b7f25f5f6a099ebd60fa71e8 (diff) | |
| download | meson-d5a6ab31bfbcec9838805c598be75abb036aff87.zip meson-d5a6ab31bfbcec9838805c598be75abb036aff87.tar.gz meson-d5a6ab31bfbcec9838805c598be75abb036aff87.tar.bz2 | |
Fix AppVeyor script
| -rw-r--r-- | .appveyor.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 22a5812..46edbd4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -78,7 +78,14 @@ install: - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) - cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=%arch% ) - - cmd: if %compiler%==msys2-mingw (if %arch%==x86 (set "PATH=C:\msys64\mingw32\bin;%PATH%") else (set "PATH=C:\msys64\mingw64\bin;%PATH%")) + - ps: | + If($Env:compiler -eq 'msys2-mingw') { + If($Env:arch -eq 'x86') { + $env:Path = 'C:\msys64\mingw32\bin;' + $env:Path + } Else { + $env:Path = 'C:\msys64\mingw64\bin;' + $env:Path + } + } - cmd: if not %compiler%==cygwin ( set "PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%;" ) - cmd: if %compiler%==cygwin ( set PYTHON=python3 ) else ( set PYTHON=python ) - cmd: if %compiler%==cygwin ( set WRAPPER=ci\run-in-cygwin.bat ) |