summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2018-04-15 09:42:55 -0400
committerAnthony Green <green@moxielogic.com>2018-04-15 09:42:55 -0400
commitee0603b39eba60da0696880fb0f343dfc64f6577 (patch)
treea2574bd43b73711eefa21d68b6844024c426e134
parentf2afda08e85b02888350449dcf39a6c37cfb7bc4 (diff)
downloadlibffi-ee0603b39eba60da0696880fb0f343dfc64f6577.tar.gz
more vairants
-rw-r--r--.appveyor.yml30
1 files changed, 19 insertions, 11 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index c388fc6..41e0bb7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,31 +18,39 @@ environment:
CYG_CACHE: C:/cygwin/var/cache/setup
CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
matrix:
- - VSVER: 12
+ - PLATFORM: x64
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ - PLATFORM: x86
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ - PLATFORM: x64
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ - PLATFORM: x86
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
install:
- ps: >-
If ($env:Platform -Match "x86") {
- $env:VCVARS_PLATFORM="x86"
$env:BUILD="x86-pc-cygwin"
$env:HOST="x86-pc-windows"
+ $env:ARCH_CFLAG="-m32"
} Else {
- $env:VCVARS_PLATFORM="amd64"
- $env:BUILD="x86_64-w64-cygwin"
- $env:HOST="x86_64-w64-cygwin"
+ $env:BUILD="x86_64-pc-cygwin"
+ $env:HOST="x86_64-pc-winnt"
+ $env:ARCH_CFLAG="-m64"
}
- 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName setup.exe'
- 'setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P dejagnu >NUL'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
- - echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
- - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x64" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
+ - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
build_script:
- c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./autogen.sh;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='/cygdrive/c/projects/libffi/msvcc.sh -m64' CXX='/cygdrive/c/projects/libffi/msvcc.sh -m64' LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='/cygdrive/c/projects/libffi/.travis/ar-lib lib' NM='dumpbin -symbols' STRIP=':' --build=$BUILD --host=$HOST;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp src/x86/ffitarget.h include; make; find .;)"
- - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp `find . -name 'libffi-?.dll'` $HOST/testsuite/; make check; cat `find ./ -name libffi.log`)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='/cygdrive/c/projects/libffi/msvcc.sh $ARCH_CFLAG' CXX='/cygdrive/c/projects/libffi/msvcc.sh $ARCH_CFLAG' LD=link CPP='cl -nologo -EP' --build=$BUILD --host=$HOST; cp src/x86/ffitarget.h include; make;)"
+ - c:\cygwin\bin\sh -lc "(cd $OLDPWD/x86_64-pc-winnt/testsuite/libffi.bhaible; make CC='/cygdrive/c/projects/libffi/msvcc.sh $ARCH_CFLAG' CXX='/cygdrive/c/projects/libffi/msvcc.sh $ARCH_CFLAG' LD=link CPP='cl -nologo -EP'; )"
# FIXME: "make check" currently fails. It just looks like msvcc needs
# to learn about -L and -l options. If you add "make check; cat `find