Skip to content

Commit ea73b01

Browse files
ajoubertzaajoubertza
authored
Merge pull request #5 from ajoubertza/omniorb-v425
Update to omniorb 4.2.5, drop old Python versions
2 parents f856df9 + 654e536 commit ea73b01

File tree

1 file changed

+27
-156
lines changed

1 file changed

+27
-156
lines changed

‎appveyor.yml‎

Lines changed: 27 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -3,221 +3,92 @@ version: 1.0.{build}
33
environment:
44
matrix:
55
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
6-
platform: x64
76
ARCH: x64-msvc15
87
configuration: Release
98
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
10-
MSVCVERSION: v141
11-
MSVCYEAR: "vs2017"
129
MSVCABR: "15"
13-
VC_VER: 15.0
1410
PYTHONPATH: c:\Python37-x64\
1511
PYTHONPATHOMNI: "/cygdrive/c/Python37-x64/python"
16-
BOOST_ROOT: C:\Libraries\boost_1_63_0
17-
ZMQ_BASE: C:\projects\libzmq
18-
IDL_BASE: C:\projects\tangoidl
19-
IDL_BIN: C:\Program Files\tangoidl
20-
OMNI_BASE: C:\projects\omniORB-4.2.1
2112
PYVER: "py37"
2213
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
23-
platform: win32
2414
ARCH: win32-msvc15
2515
configuration: Release
2616
CMAKE_GENERATOR: "Visual Studio 15 2017"
27-
MSVCVERSION: v141
28-
MSVCYEAR: "vs2017"
2917
MSVCABR: "15"
30-
VC_VER: 15.0
3118
PYTHONPATH: c:\Python37\
3219
PYTHONPATHOMNI: "/cygdrive/c/Python37/python"
33-
BOOST_ROOT: C:\Libraries\boost_1_63_0
34-
ZMQ_BASE: C:\projects\libzmq
35-
IDL_BASE: C:\projects\tangoidl
36-
IDL_BIN: C:\Program Files\tangoidl
37-
OMNI_BASE: C:\projects\omniORB-4.2.1
3820
PYVER: "py37"
3921
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
40-
platform: x64
4122
ARCH: x64-msvc14
4223
configuration: Release
4324
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
44-
MSVCVERSION: "v140"
45-
MSVCYEAR: "vs2015"
4625
MSVCABR: "14"
47-
VC_VER: 14.0
4826
PYTHONPATH: c:\Python36-x64\
4927
PYTHONPATHOMNI: "/cygdrive/c/Python36-x64/python"
5028
PYVER: "py36"
5129
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
52-
platform: x64
53-
ARCH: x64-msvc12
54-
configuration: Release
55-
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
56-
MSVCVERSION: "v120"
57-
MSVCYEAR: "vs2013"
58-
MSVCABR: "13"
59-
VC_VER: 13.0
60-
PYTHONPATH: c:\Python33-x64\
61-
PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python"
62-
PYVER: "py33"
63-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
64-
platform: x64
65-
ARCH: x64-msvc10
66-
configuration: Release
67-
CMAKE_GENERATOR: "Visual Studio 10 2010 Win64"
68-
MSVCVERSION: "v100"
69-
MSVCYEAR: "vs2010"
70-
MSVCABR: "10"
71-
VC_VER: 10.0
72-
PYTHONPATH: c:\Python33-x64\
73-
PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python"
74-
PYVER: "py33"
75-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
76-
platform: x64
77-
ARCH: x64-msvc9
78-
configuration: Release
79-
CMAKE_GENERATOR: Visual Studio 9 2008 Win64
80-
MSVCVERSION: v90
81-
MSVCYEAR: vs2008
82-
MSVCABR: 9
83-
VC_VER: 9.0
84-
PYTHONPATH: c:\Python27-x64\
85-
PYTHONPATHOMNI: "/cygdrive/c/Python27-x64/python"
86-
PYVER: "py27"
87-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
88-
platform: win32
89-
ARCH: win32-msvc9
90-
configuration: Release
91-
CMAKE_GENERATOR: "Visual Studio 9 2008"
92-
MSVCVERSION: "v90"
93-
MSVCYEAR: "vs2008"
94-
MSVCABR: "9"
95-
VC_VER: 9.0
96-
PYTHONPATH: c:\Python27\
97-
PYTHONPATHOMNI: "/cygdrive/c/Python27/python"
98-
PYVER: "py27"
99-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
100-
platform: win32
101-
ARCH: win32-msvc10
102-
configuration: Release
103-
CMAKE_GENERATOR: "Visual Studio 10 2010"
104-
MSVCVERSION: "v100"
105-
MSVCYEAR: "vs2010"
106-
MSVCABR: "10"
107-
VC_VER: 10.0
108-
PYTHONPATH: c:\Python33\
109-
PYTHONPATHOMNI: "/cygdrive/c/Python33/python"
110-
PYVER: "py33"
111-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
112-
platform: win32
113-
ARCH: win32-msvc12
114-
configuration: Release
115-
CMAKE_GENERATOR: "Visual Studio 12 2013"
116-
MSVCVERSION: "v120"
117-
MSVCYEAR: "vs2013"
118-
MSVCABR: "13"
119-
VC_VER: 13.0
120-
PYTHONPATH: c:\Python33\
121-
PYTHONPATHOMNI: "/cygdrive/c/Python33/python"
122-
PYVER: "py33"
123-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
124-
platform: win32
12530
ARCH: win32-msvc14
12631
configuration: Release
12732
CMAKE_GENERATOR: "Visual Studio 14 2015"
128-
MSVCVERSION: "v140"
129-
MSVCYEAR: "vs2015"
13033
MSVCABR: "14"
131-
VC_VER: 14.0
13234
PYTHONPATH: c:\Python36\
13335
PYTHONPATHOMNI: "/cygdrive/c/Python36/python"
13436
PYVER: "py36"
37+
13538
init:
136-
# go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569)
137-
- 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"
138-
#RDP from start
139-
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
39+
# Uncomment next line, to allow RDP access from start
40+
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
41+
14042
# OmniOrb
14143
- cmd: cd "C:\projects\"
142-
- appveyor DownloadFile https://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-4.2.1/omniORB-4.2.1-2.tar.bz2
143-
- cmd: 7z x omniORB-4.2.1-2.tar.bz2
144-
- cmd: 7z x omniORB-4.2.1-2.tar
145-
#Pthread-Win32
44+
- appveyor DownloadFile https://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-4.2.5/omniORB-4.2.5.tar.bz2
45+
- cmd: 7z x omniORB-4.2.5.tar.bz2
46+
- cmd: 7z x omniORB-4.2.5.tar
47+
48+
# Pthread-Win32
14649
- cmd: cd "C:\projects\"
14750
- cmd: md pthreads-win32
14851
- cmd: cd "C:\projects\"
149-
- appveyor DownloadFile "http://www.mirrorservice.org/sites/sources.redhat.com/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip"
150-
- cmd: 7z -y x pthreads-w32-2-9-1-release.zip -oC:\projects\pthreads-win32\
151-
#VS2008 patch
152-
- cmd: cd "C:\projects\"
153-
- cmd: appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip
154-
- cmd: 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\
155-
#- cmd: if %ARCH%==x64-msvc9 call C:\projects\vs2008_patch\setup_x64.bat
156-
- cmd: if %ARCH%==x32-msvc9 call C:\projects\vs2008_patch\setup_x86.bat
52+
- appveyor DownloadFile https://github.com/tango-controls/Pthread_WIN32/releases/download/2.9.1/pthreads-win32-2.9.1_%ARCH%.zip
53+
- cmd: 7z -y x pthreads-win32-2.9.1_%ARCH%.zip -oC:\projects\pthreads-win32\
54+
55+
# Finally, return to project folder before repo is cloned
15756
- cmd: cd "C:\projects\omniorb-windows-ci"
15857

15958
install:
16059
- cmd: set PYTHONPATH=%PYTHONPATH%
16160
- cmd: set path=%PATH%;c:\cygwin64\bin;%PYTHONPATH%
16261
- cmd: set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
163-
- cmd: if %ARCH%==win32-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
164-
- cmd: if %ARCH%==win32-msvc9 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
165-
- cmd: if %ARCH%==x64-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat"
166-
- cmd: if %ARCH%==win32-msvc10 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
167-
- cmd: if %ARCH%==win32-msvc10 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
168-
- cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /%configuration%
169-
- cmd: if %ARCH%==win32-msvc12 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
17062
- cmd: if %ARCH%==win32-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
171-
- cmd: if %ARCH%==x64-msvc12 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
17263
- cmd: if %ARCH%==x64-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
17364
- cmd: if %ARCH%==win32-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
17465
- cmd: if %ARCH%==x64-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
17566
- cmd: echo "Generator='%CMAKE_GENERATOR%'"
176-
- cmd: echo "Platform='%Platform%'"
67+
- cmd: echo "Platform='%platform%' (set by vcvars batch file)"
17768
# OmniOrb
178-
- cmd: cd "C:\projects\omniORB-4.2.1"
179-
- cmd: set MSVCABR = %MSVCABR%
180-
- cmd: set platform = %platform%
181-
- cmd: set PYTHONPATHOMNI = %PYTHONPATHOMNI%
182-
# Create 64 versions
183-
- cmd: copy c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_14.mk c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_15.mk
184-
- ps: (get-content c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_15.mk) | foreach-object {$_ -replace "_vc14", "_vc15"} | set-content c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_15.mk
185-
- cmd: copy c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_%MSVCABR%.mk c:\projects\omniORB-4.2.1\mk\platforms\x86_x64_vs_%MSVCABR%.mk
186-
# Add 64 links
187-
- ps: (get-content c:\projects\omniORB-4.2.1\mk\platforms\x86_x64_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "-DEBUG", "-DEBUG -MACHINE:X64"} | set-content c:\projects\omniORB-4.2.1\mk\platforms\x86_x64_vs_${env:MSVCABR}.mk
188-
# Editing OmniOrb config
189-
- cmd: cd "C:\projects\omniORB-4.2.1\src"
190-
- ps: if (${env:APPVEYOR_BUILD_WORKER_IMAGE} -Match "Visual Studio 2015") {(get-content c:\projects\omniORB-4.2.1\config\config.mk) | foreach-object {$_ -replace "\#platform = x86_win32_vs_${env:MSVCABR}", "platform = x86_${env:platform}_vs_${env:MSVCABR}"} | set-content c:\projects\omniORB-4.2.1\config\config.mk}
191-
- ps: if (${env:APPVEYOR_BUILD_WORKER_IMAGE} -Match "Visual Studio 2015") {(get-content c:\projects\omniORB-4.2.1\mk\platforms\x86_${env:platform}_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "\#PYTHON = /cygdrive/c/Python26/python", "PYTHON = ${env:PYTHONPATHOMNI}"} | set-content c:\projects\omniORB-4.2.1\mk\platforms\x86_${env:platform}_vs_$env:MSVCABR.mk}
192-
193-
- ps: if (${env:ARCH} -Match "win32-msvc15") {(get-content c:\projects\omniORB-4.2.1\config\config.mk) | foreach-object {$_ -replace "\#platform = x86_win32_vs_14", "platform = x86_win32_vs_15"} | set-content c:\projects\omniORB-4.2.1\config\config.mk }
194-
- ps: if (${env:ARCH} -Match "win32-msvc15") {(get-content c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "\#PYTHON = /cygdrive/c/Python26/python", "PYTHON = ${env:PYTHONPATHOMNI}"} | set-content c:\projects\omniORB-4.2.1\mk\platforms\x86_win32_vs_$env:MSVCABR.mk }
195-
196-
- ps: if (${env:ARCH} -Match "x64-msvc15") {(get-content c:\projects\omniORB-4.2.1\config\config.mk) | foreach-object {$_ -replace "\#platform = x86_win32_vs_14", "platform = x86_${env:platform}_vs_15"} | set-content c:\projects\omniORB-4.2.1\config\config.mk }
197-
- ps: if (${env:ARCH} -Match "x64-msvc15") {(get-content c:\projects\omniORB-4.2.1\mk\platforms\x86_${env:platform}_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "\#PYTHON = /cygdrive/c/Python26/python", "PYTHON = ${env:PYTHONPATHOMNI}"} | set-content c:\projects\omniORB-4.2.1\mk\platforms\x86_${env:platform}_vs_$env:MSVCABR.mk }
198-
199-
#- cmd: type "c:\projects\omniORB-4.2.1\mk\platforms\x86_%platform%_vs_%MSVCABR%.mk"
200-
#- cmd: set path=%path%;c:\cygwin64\bin
201-
- cmd: if %ARCH%==win32-msvc14 set path=%path%;%PYTHONPATH%
202-
- cmd: if %ARCH%==x64-msvc14 set path=%path%;%PYTHONPATH%
203-
- cmd: if %ARCH%==win32-msvc15 set path=%path%;%PYTHONPATH%
204-
- cmd: if %ARCH%==x64-msvc15 set path=%path%;%PYTHONPATH%
205-
#- cmd: if %ARCH%==x64-msvc14 set path=%path%;c:\cygwin64\bin;%PYTHONPATH%
206-
#- cmd: set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path%
69+
# For x64 platform, change linker option (the "win32" in the file name doesn't matter)
70+
- ps: if (${env:platform} -Match "x64") {(get-content c:\projects\omniORB-4.2.5\mk\platforms\x86_win32_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "-DEBUG", "-DEBUG -MACHINE:X64"} | set-content c:\projects\omniORB-4.2.5\mk\platforms\x86_win32_vs_${env:MSVCABR}.mk}
71+
# Edit config to enable the right build, with right Python version
72+
- ps: (get-content c:\projects\omniORB-4.2.5\config\config.mk) | foreach-object {$_ -replace "\#platform = x86_win32_vs_${env:MSVCABR}", "platform = x86_win32_vs_${env:MSVCABR}"} | set-content c:\projects\omniORB-4.2.5\config\config.mk
73+
- ps: (get-content c:\projects\omniORB-4.2.5\mk\platforms\x86_win32_vs_${env:MSVCABR}.mk) | foreach-object {$_ -replace "\#PYTHON = /cygdrive/c/Python36/python", "PYTHON = ${env:PYTHONPATHOMNI}"} | set-content c:\projects\omniORB-4.2.5\mk\platforms\x86_win32_vs_${env:MSVCABR}.mk
20774

20875
build_script:
76+
- cmd: cd "C:\projects\omniORB-4.2.5\src"
20977
- cmd: make export
21078
after_build:
21179
- cmd: cd "C:\projects\omniorb-windows-ci"
21280
# Generating zip
213-
- cmd: 7z a omniorb-4.2.1_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.1\bin\
214-
- cmd: 7z a omniorb-4.2.1_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.1\lib\
215-
- cmd: 7z a omniorb-4.2.1_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.1\include\
81+
- cmd: 7z a omniorb-4.2.5_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.5\bin\
82+
- cmd: 7z a omniorb-4.2.5_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.5\lib\
83+
- cmd: 7z a omniorb-4.2.5_%ARCH%_%PYVER%.zip c:\projects\omniORB-4.2.5\include\
84+
85+
on_failure:
86+
# RDP for failure
87+
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
21688

21789
on_finish:
21890
#RDP for finish
21991
#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
22092

22193
artifacts:
22294
- path: ./*.zip
223-

0 commit comments

Comments
 (0)