Skip to content

Commit cbc81ed

Browse files
authored
Merge pull request #100 from phalcon/development
Update Windows builds for PHP 8.0
2 parents dfe7669 + 60e6e53 commit cbc81ed

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.appveyor.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,73 @@ environment:
77
VC_VERSION: 14
88
BUILD_TYPE: "Win32"
99
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
10+
VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
1011

1112
- PHP_VERSION: 7.0
1213
VC_VERSION: 14
1314
BUILD_TYPE: "nts-Win32"
1415
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
16+
VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
1517

1618
- PHP_VERSION: 7.1
1719
VC_VERSION: 14
1820
BUILD_TYPE: "Win32"
1921
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
22+
VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
2023

2124
- PHP_VERSION: 7.1
2225
VC_VERSION: 14
2326
BUILD_TYPE: "nts-Win32"
2427
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
28+
VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
2529

2630
- PHP_VERSION: 7.2
2731
VC_VERSION: 15
2832
BUILD_TYPE: "Win32"
2933
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
34+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
3035

3136
- PHP_VERSION: 7.2
3237
VC_VERSION: 15
3338
BUILD_TYPE: "nts-Win32"
3439
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
40+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
3541

3642
- PHP_VERSION: 7.3
3743
VC_VERSION: 15
3844
BUILD_TYPE: Win32
3945
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
46+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
4047

4148
- PHP_VERSION: 7.3
4249
VC_VERSION: 15
4350
BUILD_TYPE: nts-Win32
4451
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
52+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
4553

4654
- PHP_VERSION: 7.4
4755
VC_VERSION: 15
4856
BUILD_TYPE: Win32
4957
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
58+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
5059

5160
- PHP_VERSION: 7.4
5261
VC_VERSION: 15
5362
BUILD_TYPE: nts-Win32
5463
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
64+
VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
65+
66+
- PHP_VERSION: 8.0
67+
VC_VERSION: 16
68+
BUILD_TYPE: Win32
69+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
70+
VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
71+
72+
- PHP_VERSION: 8.0
73+
VC_VERSION: 16
74+
BUILD_TYPE: nts-Win32
75+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
76+
VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
5577

5678
PHP_SDK_VERSION: 2.1.9
5779
PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1
@@ -77,6 +99,7 @@ branches:
7799
only:
78100
- master
79101
- development
102+
- windows-builds-php8
80103

81104
init:
82105
- ps: $DebugPreference = 'SilentlyContinue' # Continue
@@ -93,9 +116,8 @@ install:
93116
- ps: TuneUpPhp
94117

95118
build_script:
119+
- if NOT "%VCVARSALL%" == "" call "%VCVARSALL%" %PLATFORM%
96120
- ps: InitializeBuildVars
97-
- '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
98-
- '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
99121
- phpsdk_setvars
100122
- cmd /c .ci\build-win32.bat
101123
- phpize

.ci/AppVeyor.psm1

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,6 @@
66
# the LICENSE file that was distributed with this source code.
77

88
Function InitializeBuildVars {
9-
switch ($Env:VC_VERSION) {
10-
'14' {
11-
If (-not (Test-Path $Env:VS120COMNTOOLS)) {
12-
Throw 'The VS120COMNTOOLS environment variable is not set. Check your MS VS installation'
13-
}
14-
$Env:VSCOMNTOOLS = $Env:VS120COMNTOOLS
15-
break
16-
}
17-
'15' {
18-
If (-not (Test-Path $Env:VS140COMNTOOLS)) {
19-
Throw 'The VS140COMNTOOLS environment variable is not set. Check your MS VS installation'
20-
}
21-
$Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS
22-
break
23-
}
24-
default {
25-
Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation'
26-
break
27-
}
28-
}
29-
309
If ($Env:PLATFORM -eq 'x64') {
3110
$Env:ARCH = 'x86_amd64'
3211
} Else {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
The Zephir Parser delivered as a C extension for the PHP language.
99

10-
Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3** and **7.4**.
10+
Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3**, **7.4** and **8.0**
1111

1212
**NOTE:** The [`development`][:dev-branch:]
1313
branch will always contain the latest **unstable** version. If you wish to

0 commit comments

Comments
 (0)