epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

appveyor-ci: use pre-installed AppVeyor MinGW

Browse Source
This commit is contained in:
Ralph Lange
2019-05-03 15:34:01 +02:00
parent 3110322f8c
commit 52cdfe0a44
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@@ -48,6 +48,7 @@ environment:
TOOLCHAIN: 2017
- TOOLCHAIN: cygwin
- TOOLCHAIN: mingw
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# Platform: architecture
platform:

8
.ci/appveyor-make.bat
View File

@@ -42,13 +42,13 @@ if "%TOOLCHAIN%"=="mingw" (
set "MAKE=mingw32-make"
if "%OS%"=="64BIT" (
set "EPICS_HOST_ARCH=windows-x64-mingw"
set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%"
set "PATH=C:\tools\mingw64\bin;%PATH%"
set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%"
set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%"
echo [INFO] MinGW Toolchain 64bit
) else (
set "EPICS_HOST_ARCH=win32-x86-mingw"
set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%"
set "PATH=C:\tools\mingw32\bin;%PATH%"
set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%"
set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%"
echo [INFO] MinGW Toolchain 32bit
)
echo [INFO] Compiler Version

7
.ci/appveyor-prepare.bat
View File

@@ -55,13 +55,6 @@ if "%TOOLCHAIN%"=="mingw" (
) || (
echo [INFO] EPICS set up for optimized build
)
if "%OS%"=="64BIT" (
echo [INFO] Installing MinGW 64bit
cinst mingw --version="5.3.0" || cinst mingw --version="5.3.0"
) else (
echo [INFO] Installing MinGW 32bit
cinst mingw --x86 --version="5.3.0" || cinst mingw --x86 --version="5.3.0"
)
)
echo [INFO] Installing Make 4.1