Okay, let's see if it's because of the multiline scripts.

This commit is contained in:
Pietro Gagliardi 2019-04-07 20:53:32 -04:00
parent 0b319032b6
commit 73e4e58c80
1 changed files with 35 additions and 42 deletions

View File

@ -38,52 +38,45 @@ platform:
# Note: AppVeyor tries to be "helpful" and splits cmd.exe scripts into their constitutent lines to check their error codes. There is no way to switch this off; for true multi-line scripts we have to use PowerShell. But we need to use vcvarsall.bat, so that's out of the question. # Note: AppVeyor tries to be "helpful" and splits cmd.exe scripts into their constitutent lines to check their error codes. There is no way to switch this off; for true multi-line scripts we have to use PowerShell. But we need to use vcvarsall.bat, so that's out of the question.
install: install:
- cmd: | # Set Python Version
rem Set Python Version - set "PYTHON_ROOT=C:\python37-x64"
set "PYTHON_ROOT=C:\python37-x64" - if %arch%==386 ( set "PYTHON_ROOT=C:\python37" )
if %arch%==386 ( set "PYTHON_ROOT=C:\python37" ) - set "PATH=%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH%"
set "PATH=%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH%" # Install Latest Meson
- pip install meson
rem Install Latest Meson # Install Ninja
pip install meson - powershell -Command "Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -OutFile C:\ninja-win.zip"
- mkdir C:\ninja
rem Install Ninja - powershell -Command "Expand-Archive -LiteralPath C:\ninja-win.zip -DestinationPath C:\ninja"
powershell -Command "Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -OutFile C:\ninja-win.zip" - set "PATH=C:\ninja;%PATH%"
mkdir C:\ninja # Parameters for the build_script phase, to reduce their noise.
powershell -Command "Expand-Archive -LiteralPath C:\ninja-win.zip -DestinationPath C:\ninja" - set "mingwPath=C:\msys64\mingw64\bin"
set "PATH=C:\ninja;%PATH%" - set vcvarsallArch=x86
- if %arch%==386 ( set "mingwPath=C:\msys64\mingw32\bin" )
rem Parameters for the build_script phase, to reduce their noise. - if %arch%==386 ( set vcvarsallArch=amd64 )
set "mingwPath=C:\msys64\mingw64\bin"
set vcvarsallArch=x86
if %arch%==386 ( set "mingwPath=C:\msys64\mingw32\bin" )
if %arch%==386 ( set vcvarsallArch=amd64 )
build_script: build_script:
- cmd: | - if %compiler%==mingw ( set "PATH=%mingwPath%;%PATH%" )
if %compiler%==mingw ( set "PATH=%mingwPath%;%PATH%" ) - if not %compiler%==mingw ( call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %vcvarsallArch% )
if not %compiler%==mingw ( call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %vcvarsallArch% ) - meson setup build --buildtype=release --default-library=%libtype%
meson setup build --buildtype=release --default-library=%libtype% - ninja -C build
ninja -C build
after_build: after_build:
- cmd: | - set "version=%APPVEYOR_REPO_BRANCH%"
set "version=%APPVEYOR_REPO_BRANCH%" - if %APPVEYOR_REPO_TAG%==true ( set "version=%APPVEYOR_REPO_TAG_NAME%" )
if %APPVEYOR_REPO_TAG%==true ( set "version=%APPVEYOR_REPO_TAG_NAME%" ) - set "artifact=%version%-windows-%arch%-%compiler%-%libtype%"
set "artifact=%version%-windows-%arch%-%compiler%-%libtype%" - pushd build\meson-out
pushd build\meson-out # TODO msvc only?
rem TODO msvc only? - if %libtype%==static ( ren libui.a libui.lib )
if %libtype%==static ( ren libui.a libui.lib ) - copy ..\..\ui.h .
copy ..\..\ui.h . - copy ..\..\ui_windows.h .
copy ..\..\ui_windows.h . # remove unnecessary files
rem remove unnecessary files # TODO should we do this on Azure too?
rem TODO should we do this on Azure too? - del libui.exp
del libui.exp - 7z a "%APPVEYOR_BUILD_FOLDER%\libui-%artifact%.zip" %libfiles% ui.h ui_windows.h
7z a "%APPVEYOR_BUILD_FOLDER%\libui-%artifact%.zip" %libfiles% ui.h ui_windows.h - 7z a "%APPVEYOR_BUILD_FOLDER%\examples-%artifact%.zip" controlgallery.exe cpp-multithread.exe datetime.exe drawtext.exe histogram.exe tester.exe timer.exe
7z a "%APPVEYOR_BUILD_FOLDER%\examples-%artifact%.zip" controlgallery.exe cpp-multithread.exe datetime.exe drawtext.exe histogram.exe tester.exe timer.exe - del ui.h ui_windows.h
del ui.h ui_windows.h - popd
popd /?
popd
artifacts: artifacts:
- path: libui-*.zip - path: libui-*.zip