@@ -10,171 +10,198 @@ clone_folder: c:\projects\xlswriter
1010install :
1111 ps : |
1212 if (-not (Test-Path c:\build-cache)) {
13- mkdir c:\build-cache
13+ mkdir c:\build-cache
1414 }
1515 $bname = 'php-sdk-' + $env:BIN_SDK_VER + '.zip'
1616 if (-not (Test-Path c:\build-cache\$bname)) {
17- Invoke-WebRequest "https://github.com/OSTC/php-sdk-binary-tools/archive/$bname" -OutFile "c:\build-cache\$bname"
17+ Invoke-WebRequest "https://github.com/OSTC/php-sdk-binary-tools/archive/$bname" -OutFile "c:\build-cache\$bname"
1818 }
1919 $dname0 = 'php-sdk-binary-tools-php-sdk-' + $env:BIN_SDK_VER
2020 $dname1 = 'php-sdk-' + $env:BIN_SDK_VER
2121 if (-not (Test-Path c:\build-cache\$dname1)) {
22- 7z x c:\build-cache\$bname -oc:\build-cache
23- move c:\build-cache\$dname0 c:\build-cache\$dname1
22+ 7z x c:\build-cache\$bname -oc:\build-cache
23+ move c:\build-cache\$dname0 c:\build-cache\$dname1
2424 }
25- $lname0 = 'zlib-' + $env:ZLIB_VER + '-' + $env:VC + '-' + $env:ARCH + '.zip'
25+ $lname0 = 'zlib-' + $env:ZLIB_VER + '-' + $env:VC.toLower() + '-' + $env:ARCH + '.zip'
2626 $lname1 = 'zlib'
2727 if (-not (Test-Path c:\build-cache\$lname0)) {
28- $zliurl = "https://windows.php.net/downloads/php-sdk/deps/" + $env:VC + "/" + $env:ARCH+ "/" + $lname0
29- Invoke-WebRequest $zliurl -OutFile "c:\build-cache\$lname0"
28+ $zliurl = "https://windows.php.net/downloads/php-sdk/deps/" + $env:VC.toLower() + "/" + $env:ARCH + "/" + $lname0
29+ Invoke-WebRequest $zliurl -OutFile "c:\build-cache\$lname0"
3030 }
3131 if (-not (Test-Path c:\build-cache\$lname1)) {
32- & 7z x c:\build-cache\$lname0 -oc:\build-cache\$lname1
32+ 7z x c:\build-cache\$lname0 -oc:\build-cache\$lname1
3333 }
3434
3535cache :
3636 c:\build-cache -> .appveyor.yml
3737
3838environment :
39- BIN_SDK_VER : 2.1.2
39+ BIN_SDK_VER : 2.2.0
4040 matrix :
4141 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
4242 ARCH : x64
43- VC : vc14
43+ VC : VC14
4444 PHP_VER : 7.0.28
4545 ZLIB_VER : 1.2.8
4646 TS : 0
4747 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
4848 ARCH : x64
49- VC : vc14
49+ VC : VC14
5050 PHP_VER : 7.0.28
5151 ZLIB_VER : 1.2.8
5252 TS : 1
5353 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
5454 ARCH : x86
55- VC : vc14
55+ VC : VC14
5656 PHP_VER : 7.0.28
5757 ZLIB_VER : 1.2.8
5858 TS : 0
5959 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
6060 ARCH : x86
61- VC : vc14
61+ VC : VC14
6262 PHP_VER : 7.0.28
6363 ZLIB_VER : 1.2.8
6464 TS : 1
6565 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
6666 ARCH : x64
67- VC : vc14
67+ VC : VC14
6868 PHP_VER : 7.1.15
6969 ZLIB_VER : 1.2.8
7070 TS : 0
7171 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
7272 ARCH : x64
73- VC : vc14
73+ VC : VC14
7474 PHP_VER : 7.1.15
7575 ZLIB_VER : 1.2.8
7676 TS : 1
7777 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
7878 ARCH : x86
79- VC : vc14
79+ VC : VC14
8080 PHP_VER : 7.1.15
8181 ZLIB_VER : 1.2.8
8282 TS : 0
8383 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
8484 ARCH : x86
85- VC : vc14
85+ VC : VC14
8686 PHP_VER : 7.1.15
8787 ZLIB_VER : 1.2.8
8888 TS : 1
8989 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
9090 ARCH : x64
91- VC : vc15
91+ VC : VC15
9292 PHP_VER : 7.2.3
9393 ZLIB_VER : 1.2.11
9494 TS : 0
9595 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
9696 ARCH : x64
97- VC : vc15
97+ VC : VC15
9898 PHP_VER : 7.2.3
9999 ZLIB_VER : 1.2.11
100100 TS : 1
101101 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
102102 ARCH : x86
103- VC : vc15
103+ VC : VC15
104104 PHP_VER : 7.2.3
105105 ZLIB_VER : 1.2.11
106106 TS : 0
107107 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
108108 ARCH : x86
109- VC : vc15
109+ VC : VC15
110110 PHP_VER : 7.2.3
111111 ZLIB_VER : 1.2.11
112112 TS : 1
113113 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
114114 ARCH : x64
115- VC : vc15
115+ VC : VC15
116116 PHP_VER : 7.3.0
117117 ZLIB_VER : 1.2.11
118118 TS : 0
119119 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
120120 ARCH : x64
121- VC : vc15
121+ VC : VC15
122122 PHP_VER : 7.3.0
123123 ZLIB_VER : 1.2.11
124124 TS : 1
125125 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
126126 ARCH : x86
127- VC : vc15
127+ VC : VC15
128128 PHP_VER : 7.3.0
129129 ZLIB_VER : 1.2.11
130130 TS : 0
131131 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
132132 ARCH : x86
133- VC : vc15
133+ VC : VC15
134134 PHP_VER : 7.3.0
135135 ZLIB_VER : 1.2.11
136136 TS : 1
137137 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
138138 ARCH : x64
139- VC : vc15
139+ VC : VC15
140140 PHP_VER : 7.4.0
141141 ZLIB_VER : 1.2.11
142142 TS : 0
143143 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
144144 ARCH : x64
145- VC : vc15
145+ VC : VC15
146146 PHP_VER : 7.4.0
147147 ZLIB_VER : 1.2.11
148148 TS : 1
149149 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
150150 ARCH : x86
151- VC : vc15
151+ VC : VC15
152152 PHP_VER : 7.4.0
153153 ZLIB_VER : 1.2.11
154154 TS : 0
155155 - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
156156 ARCH : x86
157- VC : vc15
157+ VC : VC15
158158 PHP_VER : 7.4.0
159159 ZLIB_VER : 1.2.11
160160 TS : 1
161+ - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2019
162+ ARCH : x64
163+ VC : vs16
164+ PHP_VER : 8.0.0
165+ ZLIB_VER : 1.2.11
166+ TS : 0
167+ - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2019
168+ ARCH : x64
169+ VC : vs16
170+ PHP_VER : 8.0.0
171+ ZLIB_VER : 1.2.11
172+ TS : 1
173+ - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2019
174+ ARCH : x86
175+ VC : vs16
176+ PHP_VER : 8.0.0
177+ ZLIB_VER : 1.2.11
178+ TS : 0
179+ - APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2019
180+ ARCH : x86
181+ VC : vs16
182+ PHP_VER : 8.0.0
183+ ZLIB_VER : 1.2.11
184+ TS : 1
161185
162186build_script :
163187 ps : |
164188 $ts_part = ''
165189 if ('0' -eq $env:TS) { $ts_part = '-nts' }
166- $bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
190+ $bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC + '-' + $env:ARCH + '.zip'
167191 if (-not (Test-Path c:\build-cache\$bname)) {
168- Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
169- if (-not (Test-Path c:\build-cache\$bname)) {
170- Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
171- }
192+ try {
193+ Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
194+ } catch {
195+ if (-not (Test-Path c:\build-cache\$bname)) {
196+ Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
197+ }
198+ }
172199 }
173- $dname0 = 'php-' + $env:PHP_VER + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
174- $dname1 = 'php-' + $env:PHP_VER + $ts_part + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
200+ $dname0 = 'php-' + $env:PHP_VER + '-devel-' + $env:VC + '-' + $env:ARCH
201+ $dname1 = 'php-' + $env:PHP_VER + $ts_part + '-devel-' + $env:VC + '-' + $env:ARCH
175202 if (-not (Test-Path c:\build-cache\$dname1)) {
176- 7z x c:\build-cache\$bname -oc:\build-cache
177- move c:\build-cache\$dname0 c:\build-cache\$dname1
203+ 7z x c:\build-cache\$bname -oc:\build-cache
204+ move c:\build-cache\$dname0 c:\build-cache\$dname1
178205 }
179206 cd c:\projects\xlswriter
180207 $env:PATH = 'c:\build-cache\' + $dname1 + ';' + $env:PATH
@@ -201,23 +228,30 @@ after_build:
201228 if ('x64' -eq $env:ARCH) { $dir = $dir + 'x64\' }
202229 $dir = $dir + 'Release'
203230 if ('1' -eq $env:TS) { $dir = $dir + '_TS' }
204- & 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE c:\build-cache\zlib\lib\zlib_a.lib c:\build-cache\zlib\lib\zlib.pdb
231+ if (-not (Test-Path c:\build-cache\zlib\lib\zlib.pdb)) {
232+ 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE c:\build-cache\zlib\lib\zlib_a.lib c:\build-cache\zlib\lib\zlib_a.pdb
233+ } else {
234+ 7z a c:\$zip_bname $dir\php_xlswriter.dll c:\projects\xlswriter\LICENSE c:\build-cache\zlib\lib\zlib_a.lib c:\build-cache\zlib\lib\zlib.pdb
235+ }
205236 Push-AppveyorArtifact c:\$zip_bname
206237
207238test_script :
208239 ps : |
209240 $ts_part = ''
210241 if ('0' -eq $env:TS) { $ts_part = '-nts' }
211- $bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
242+ $bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC + '-' + $env:ARCH + '.zip'
212243 if (-not (Test-Path c:\build-cache\$bname)) {
213- Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
214- if (-not (Test-Path c:\build-cache\$bname)) {
215- Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
216- }
244+ try {
245+ Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
246+ } catch {
247+ if (-not (Test-Path c:\build-cache\$bname)) {
248+ Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
249+ }
250+ }
217251 }
218- $dname = 'php-' + $env:PHP_VER + $ts_part + '-' + $env:VC.toUpper() + '-' + $env:ARCH
252+ $dname = 'php-' + $env:PHP_VER + $ts_part + '-' + $env:VC + '-' + $env:ARCH
219253 if (-not (Test-Path c:\build-cache\$dname)) {
220- 7z x c:\build-cache\$bname -oc:\build-cache\$dname
254+ 7z x c:\build-cache\$bname -oc:\build-cache\$dname
221255 }
222256 cd c:\projects\xlswriter
223257 echo "" | Out-File -Encoding "ASCII" task.bat
0 commit comments