Skip to content

Commit 9e1c0fe

Browse files
NexeyaSGaraNexeyaSGara
authored
Merge pull request #1 from tango-controls/new-appveyor
VC2017 addition
2 parents f5a2b75 + 55ce5f1 commit 9e1c0fe

File tree

1 file changed

+90
-16
lines changed

1 file changed

+90
-16
lines changed

‎appveyor.yml‎

Lines changed: 90 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,42 @@ branches:
33
only:
44
- master
55

6-
image: Visual Studio 2015
7-
86
environment:
9-
matrix:
10-
- platform: win32
7+
matrix:
8+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
9+
platform: win32
10+
ARCH: win32-msvc15
11+
configuration: Release
12+
CMAKE_GENERATOR: "Visual Studio 15 2017"
13+
MSVCVERSION: v141
14+
MSVCYEAR: "vs2017"
15+
MSVCABR: "15"
16+
VC_VER: 15.0
17+
PYTHONPATH: c:\Python35\
18+
PYTHONPATHOMNI: "/cygdrive/c/Python35/python"
19+
BOOST_ROOT: C:\Libraries\boost_1_63_0
20+
ZMQ_BASE: C:\projects\libzmq
21+
IDL_BASE: C:\projects\tangoidl
22+
IDL_BIN: C:\Program Files\tangoidl
23+
OMNI_BASE: C:\projects\omniORB-4.2.1
24+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
25+
platform: x64
26+
ARCH: x64-msvc15
27+
configuration: Release
28+
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
29+
MSVCVERSION: v141
30+
MSVCYEAR: "vs2017"
31+
MSVCABR: "15"
32+
VC_VER: 15.0
33+
PYTHONPATH: c:\Python35-x64\
34+
PYTHONPATHOMNI: "/cygdrive/c/Python35-x64/python"
35+
BOOST_ROOT: C:\Libraries\boost_1_63_0
36+
ZMQ_BASE: C:\projects\libzmq
37+
IDL_BASE: C:\projects\tangoidl
38+
IDL_BIN: C:\Program Files\tangoidl
39+
OMNI_BASE: C:\projects\omniORB-4.2.1
40+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
41+
platform: win32
1142
ARCH: win32-msvc9
1243
configuration: Release
1344
CMAKE_GENERATOR: "Visual Studio 9 2008"
@@ -21,7 +52,8 @@ environment:
2152
IDL_BASE: C:\projects\tangoidl
2253
IDL_BIN: C:\Program Files (x86)\tangoidl
2354
OMNI_BASE: C:\projects\omniORB-4.2.1
24-
- platform: x64
55+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
56+
platform: x64
2557
ARCH: x64-msvc9
2658
configuration: Release
2759
CMAKE_GENERATOR: "Visual Studio 9 2008 Win64"
@@ -35,7 +67,8 @@ environment:
3567
IDL_BASE: C:\projects\tangoidl
3668
IDL_BIN: C:\Program Files\tangoidl
3769
OMNI_BASE: C:\projects\omniORB-4.2.1
38-
- platform: win32
70+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
71+
platform: win32
3972
ARCH: win32-msvc10
4073
configuration: Release
4174
CMAKE_GENERATOR: "Visual Studio 10 2010"
@@ -50,7 +83,8 @@ environment:
5083
IDL_BASE: C:\projects\tangoidl
5184
IDL_BIN: C:\Program Files (x86)\tangoidl
5285
OMNI_BASE: C:\projects\omniORB-4.2.1
53-
- platform: x64
86+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
87+
platform: x64
5488
ARCH: x64-msvc10
5589
configuration: Release
5690
CMAKE_GENERATOR: "Visual Studio 10 2010 Win64"
@@ -65,7 +99,23 @@ environment:
6599
IDL_BASE: C:\projects\tangoidl
66100
IDL_BIN: C:\Program Files\tangoidl
67101
OMNI_BASE: C:\projects\omniORB-4.2.1
68-
- platform: x64
102+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
103+
platform: win32
104+
ARCH: win32-msvc12
105+
configuration: Release
106+
CMAKE_GENERATOR: "Visual Studio 12 2013"
107+
MSVCVERSION: v120
108+
MSVCYEAR: "vs2013"
109+
MSVCABR: "13"
110+
VC_VER: 13.0
111+
PYTHONPATHOMNI: "/cygdrive/c/Python33/python"
112+
BOOST_ROOT: C:\Libraries\boost_1_63_0
113+
ZMQ_BASE: C:\projects\libzmq
114+
IDL_BASE: C:\projects\tangoidl
115+
IDL_BIN: C:\Program Files\tangoidl
116+
OMNI_BASE: C:\projects\omniORB-4.2.1
117+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
118+
platform: x64
69119
ARCH: x64-msvc12
70120
configuration: Release
71121
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
@@ -79,7 +129,24 @@ environment:
79129
IDL_BASE: C:\projects\tangoidl
80130
IDL_BIN: C:\Program Files\tangoidl
81131
OMNI_BASE: C:\projects\omniORB-4.2.1
82-
- platform: x64
132+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
133+
platform: win32
134+
ARCH: win32-msvc14
135+
configuration: Release
136+
CMAKE_GENERATOR: "Visual Studio 14 2015"
137+
MSVCVERSION: v140
138+
MSVCYEAR: "vs2015"
139+
MSVCABR: "14"
140+
VC_VER: 14.0
141+
PYTHONPATH: c:\Python35\
142+
PYTHONPATHOMNI: "/cygdrive/c/Python35/python"
143+
BOOST_ROOT: C:\Libraries\boost_1_63_0
144+
ZMQ_BASE: C:\projects\libzmq
145+
IDL_BASE: C:\projects\tangoidl
146+
IDL_BIN: C:\Program Files\tangoidl
147+
OMNI_BASE: C:\projects\omniORB-4.2.1
148+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
149+
platform: x64
83150
ARCH: x64-msvc14
84151
configuration: Release
85152
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
@@ -93,12 +160,12 @@ environment:
93160
ZMQ_BASE: C:\projects\libzmq
94161
IDL_BASE: C:\projects\tangoidl
95162
IDL_BIN: C:\Program Files\tangoidl
96-
OMNI_BASE: C:\projects\omniORB-4.2.1
163+
OMNI_BASE: C:\projects\omniORB-4.2.1
97164
init:
98165
# go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569)
99-
- del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets"
100-
- del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
101-
- del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
166+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets"
167+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
168+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
102169
#RDP from start
103170
#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
104171
#Pthread-Win32
@@ -109,11 +176,11 @@ init:
109176
- cmd: 7z -y x pthreads-w32-2-9-1-release.zip -oC:\projects\pthreads-win32-src\
110177
#VS2008 patch
111178
- cmd: cd "C:\projects\"
112-
- cmd: appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip
113-
- cmd: 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\
179+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip
180+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\
114181
- cmd: if %ARCH%==x64-msvc9 call C:\projects\vs2008_patch\setup_x64.bat
115182
- cmd: if %ARCH%==x32-msvc9 call C:\projects\vs2008_patch\setup_x86.bat
116-
- cmd: copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
183+
- cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
117184
- cmd: cd "C:\projects\Pthread_WIN32"
118185

119186
install:
@@ -130,8 +197,12 @@ install:
130197
- cmd: if %ARCH%==win32-msvc10 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
131198
- cmd: if %ARCH%==win32-msvc10 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
132199
- cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
200+
- cmd: if %ARCH%==win32-msvc12 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
133201
- cmd: if %ARCH%==x64-msvc12 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
202+
- cmd: if %ARCH%==win32-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
134203
- cmd: if %ARCH%==x64-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
204+
- cmd: if %ARCH%==win32-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
205+
- cmd: if %ARCH%==x64-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
135206
- cmd: echo "Generator='%CMAKE_GENERATOR%'"
136207
- cmd: echo "Platform='%Platform%'"
137208
- cmd: set PYTHONPATH=%PYTHONPATH%
@@ -145,7 +216,10 @@ build:
145216

146217
build_script:
147218
- cmd: set ARCH=%ARCH%
219+
- cmd: if %ARCH%==win32-msvc14 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile
148220
- cmd: if %ARCH%==x64-msvc14 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile
221+
- cmd: if %ARCH%==x64-msvc15 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile
222+
- cmd: if %ARCH%==win32-msvc15 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile
149223
- cmd: type "C:\projects\pthreads-win32-src\pthreads.2\Makefile"
150224
- cmd: cd C:/projects/pthreads-win32-src/pthreads.2
151225
- cmd: nmake VC-static

0 commit comments

Comments
 (0)