Skip to content

Commit 7dfb3ad

Browse files
committed
drop vs2008 jobs
Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
1 parent f2efd05 commit 7dfb3ad

2 files changed

Lines changed: 12 additions & 32 deletions

File tree

appveyor.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,14 @@ environment:
44
Compiler: vs2015
55
- Architecture: x64
66
Compiler: vs2015
7-
- Architecture: x86
8-
Compiler: vs2008
9-
- Architecture: x64
10-
Compiler: vs2008
11-
PYTHON_ARCH: 64
12-
PATCH_VS2008: True
137
install:
148
- cmd: git submodule update --init --recursive
159
- ps: install-module pscx -scope CurrentUser -AllowClobber
16-
- ps: >-
17-
if ($env:PATCH_VS2008 -eq 'True') {
18-
# http://scikit-ci-addons.readthedocs.io/en/latest/addons.html#patch-vs2008-py
19-
C:\Python27\python -m pip install scikit-ci-addons
20-
C:\Python27\python -m ci_addons appveyor/patch_vs2008
21-
# http://help.appveyor.com/discussions/kb/38-visual-studio-2008-64-bit-builds
22-
Copy-Item "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"
23-
}
2410
build: off
2511
build_script:
2612
- ps: >-
2713
$x64param = if ($env:Architecture -eq 'x64') { $true } else { $false }
28-
29-
$vs2008param = if ($env:Compiler -eq 'vs2008') { $true } else { $false }
30-
31-
.\build.ps1 -x64:$x64param -vs2008:$vs2008param
14+
.\build.ps1 -x64:$x64param
3215
3316
test: off
3417
test_script:

build.ps1

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
This script builds libiconv,libxml2, libxslt, openssl and xmlsec
33
#>
44
Param(
5-
[switch]$x64,
6-
[switch]$vs2008
5+
[switch]$x64
76
)
87

98
Function ThrowIfError($exitCode, $module)
@@ -19,24 +18,22 @@ Import-Module Pscx
1918

2019
$x64Dir = If($x64) { "\x64" } Else { "" }
2120
$distname = If($x64) { "win64" } Else { "win32" }
22-
If($vs2008) { $distname = "vs2008.$distname" }
21+
$vcarch = If($x64) { "x64" } Else {"Win32"}
2322
$vcvarsarch = If($x64) { "amd64" } Else { "x86" }
24-
$vsver = If($vs2008) { "90" } Else { "140" }
2523

2624
Set-Location $PSScriptRoot
2725

28-
Import-VisualStudioVars -VisualStudioVersion $vsver -Architecture $vcvarsarch
26+
Import-VisualStudioVars -VisualStudioVersion 140 -Architecture $vcvarsarch
2927

30-
if($vs2008) {
31-
Set-Location .\libiconv\MSVC9
32-
$vcarch = If($x64) { "x64" } Else {"Win32"}
33-
vcbuild libiconv_static\libiconv_static.vcproj "Release|$vcarch"
34-
} else {
35-
Set-Location .\libiconv\MSVC14
36-
msbuild libiconv.sln /p:Configuration=Release /t:libiconv_static
37-
}
28+
Set-Location .\libiconv\MSVC14
29+
msbuild libiconv.sln /p:Configuration=Release /p:Platform=$vcarch /t:libiconv_static
3830
ThrowIfError $LastExitCode "libiconv"
39-
$iconvLib = Join-Path (pwd) libiconv_static$x64Dir\Release
31+
If($x64) {
32+
$iconvLib = Join-Path (pwd) x64\lib
33+
}
34+
else {
35+
$iconvLib = Join-Path (pwd) Win32\lib
36+
}
4037
$iconvInc = Join-Path (pwd) ..\source\include
4138
Set-Location ..\..
4239

0 commit comments

Comments
 (0)