Skip to content

Commit e82dce6

Browse files
committed
Add x64-windows-webkit triplet
Specify the linkage of the dependent libraries. This is a precursor to use zlib-ng instead of zlib.
1 parent eea4a9c commit e82dce6

File tree

2 files changed

+41
-27
lines changed

2 files changed

+41
-27
lines changed

.github/workflows/build.yaml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
triplet: [x64-windows]
18+
triplet: [x64-windows-webkit]
1919

2020
steps:
2121
- uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
4040
id: zlib
4141
if: steps.vcpkg.outcome == 'success'
4242
continue-on-error: true
43-
run: ./vcpkg.exe install zlib --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
43+
run: ./vcpkg.exe install zlib --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
4444
- name: Read zlib config
4545
if: steps.zlib.outcome == 'success' || steps.zlib.outcome == 'failure'
4646
continue-on-error: true
@@ -58,7 +58,7 @@ jobs:
5858
id: brotli
5959
if: steps.vcpkg.outcome == 'success'
6060
continue-on-error: true
61-
run: ./vcpkg.exe install brotli --triplet ${{ matrix.triplet }}
61+
run: ./vcpkg.exe install brotli --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
6262
- name: Read brotli config
6363
if: steps.brotli.outcome == 'success' || steps.brotli.outcome == 'failure'
6464
continue-on-error: true
@@ -76,7 +76,7 @@ jobs:
7676
id: libressl
7777
if: steps.vcpkg.outcome == 'success'
7878
continue-on-error: true
79-
run: ./vcpkg.exe install libressl[tools] --triplet ${{ matrix.triplet }}
79+
run: ./vcpkg.exe install libressl[tools] --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
8080
- name: Read libressl config
8181
if: steps.libressl.outcome == 'success' || steps.libressl.outcome == 'failure'
8282
continue-on-error: true
@@ -94,7 +94,7 @@ jobs:
9494
id: nghttp2
9595
if: steps.vcpkg.outcome == 'success'
9696
continue-on-error: true
97-
run: ./vcpkg.exe install nghttp2 --triplet ${{ matrix.triplet }}
97+
run: ./vcpkg.exe install nghttp2 --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
9898
- name: Read nghttp2 config
9999
if: steps.nghttp2.outcome == 'success' || steps.nghttp2.outcome == 'failure'
100100
continue-on-error: true
@@ -112,7 +112,7 @@ jobs:
112112
id: ngtcp2
113113
if: steps.libressl.outcome == 'success'
114114
continue-on-error: true
115-
run: ./vcpkg.exe install ngtcp2[libressl] --triplet ${{ matrix.triplet }}
115+
run: ./vcpkg.exe install ngtcp2[libressl] --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
116116
- name: Read ngtcp2 config
117117
if: steps.ngtcp2.outcome == 'success' || steps.ngtcp2.outcome == 'failure'
118118
continue-on-error: true
@@ -130,7 +130,7 @@ jobs:
130130
id: nghttp3
131131
if: steps.vcpkg.outcome == 'success'
132132
continue-on-error: true
133-
run: ./vcpkg.exe install nghttp3 --triplet ${{ matrix.triplet }}
133+
run: ./vcpkg.exe install nghttp3 --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
134134
- name: Read nghttp3 config
135135
if: steps.nghttp3.outcome == 'success' || steps.nghttp3.outcome == 'failure'
136136
continue-on-error: true
@@ -154,7 +154,7 @@ jobs:
154154
steps.ngtcp2.outcome == 'success' &&
155155
steps.nghttp3.outcome == 'success'
156156
continue-on-error: true
157-
run: ./vcpkg.exe install curl[libressl,http3,ipv6] --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
157+
run: ./vcpkg.exe install curl[libressl,http3,ipv6] --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
158158
- name: Read curl config
159159
if: steps.curl.outcome == 'success' || steps.curl.outcome == 'failure'
160160
continue-on-error: true
@@ -172,7 +172,7 @@ jobs:
172172
id: icu
173173
if: steps.vcpkg.outcome == 'success'
174174
continue-on-error: true
175-
run: ./vcpkg.exe install icu --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
175+
run: ./vcpkg.exe install icu --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
176176
- name: Read icu config
177177
if: steps.icu.outcome == 'success' || steps.icu.outcome == 'failure'
178178
continue-on-error: true
@@ -190,7 +190,7 @@ jobs:
190190
id: libxml2
191191
if: steps.icu.outcome == 'success'
192192
continue-on-error: true
193-
run: ./vcpkg.exe install libxml2[xslt] --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
193+
run: ./vcpkg.exe install libxml2[xslt] --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
194194
- name: Read libxml2 config
195195
if: steps.libxml2.outcome == 'success' || steps.libxml2.outcome == 'failure'
196196
continue-on-error: true
@@ -208,7 +208,7 @@ jobs:
208208
id: libxslt
209209
if: steps.libxml2.outcome == 'success'
210210
continue-on-error: true
211-
run: ./vcpkg.exe install libxslt --triplet ${{ matrix.triplet }}
211+
run: ./vcpkg.exe install libxslt --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
212212
- name: Read libxslt config
213213
if: steps.libxslt.outcome == 'success' || steps.libxslt.outcome == 'failure'
214214
continue-on-error: true
@@ -226,25 +226,29 @@ jobs:
226226
id: lcms
227227
if: steps.vcpkg.outcome == 'success'
228228
continue-on-error: true
229-
run: ./vcpkg.exe install lcms --triplet ${{ matrix.triplet }}
230-
- name: Read lcms config
229+
run: ./vcpkg.exe install lcms --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
230+
- name: Read lcms debug config
231231
if: steps.lcms.outcome == 'success' || steps.lcms.outcome == 'failure'
232232
continue-on-error: true
233-
run: Get-Content ./buildtrees/lcms/config-${{ matrix.triplet }}-out.log
233+
run: Get-Content ./buildtrees/lcms/config-${{ matrix.triplet }}-dbg-out.log
234234
- name: Read lcms debug build log
235235
if: steps.lcms.outcome == 'success' || steps.lcms.outcome == 'failure'
236236
continue-on-error: true
237-
run: Get-Content ./buildtrees/lcms/install-${{ matrix.triplet }}-dbg-out.log
237+
run: Get-Content ./buildtrees/lcms/package-${{ matrix.triplet }}-dbg-out.log
238+
- name: Read lcms release config
239+
if: steps.lcms.outcome == 'success' || steps.lcms.outcome == 'failure'
240+
continue-on-error: true
241+
run: Get-Content ./buildtrees/lcms/config-${{ matrix.triplet }}-rel-out.log
238242
- name: Read lcms release build log
239243
if: steps.lcms.outcome == 'success' || steps.lcms.outcome == 'failure'
240244
continue-on-error: true
241-
run: Get-Content ./buildtrees/lcms/install-${{ matrix.triplet }}-rel-out.log
245+
run: Get-Content ./buildtrees/lcms/package-${{ matrix.triplet }}-rel-out.log
242246

243247
- name: Build highway
244248
id: highway
245249
if: steps.vcpkg.outcome == 'success'
246250
continue-on-error: true
247-
run: ./vcpkg.exe install highway --triplet ${{ matrix.triplet }}
251+
run: ./vcpkg.exe install highway --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
248252
- name: Read highway config
249253
if: steps.highway.outcome == 'success' || steps.highway.outcome == 'failure'
250254
continue-on-error: true
@@ -262,7 +266,7 @@ jobs:
262266
id: libpng
263267
if: steps.zlib.outcome == 'success'
264268
continue-on-error: true
265-
run: ./vcpkg.exe install libpng --triplet ${{ matrix.triplet }}
269+
run: ./vcpkg.exe install libpng --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
266270
- name: Read libpng config
267271
if: steps.libpng.outcome == 'success' || steps.libpng.outcome == 'failure'
268272
continue-on-error: true
@@ -280,7 +284,7 @@ jobs:
280284
id: libjpeg
281285
if: steps.vcpkg.outcome == 'success'
282286
continue-on-error: true
283-
run: ./vcpkg.exe install libjpeg-turbo --triplet ${{ matrix.triplet }}
287+
run: ./vcpkg.exe install libjpeg-turbo --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
284288
- name: Read libjpeg-turbo config
285289
if: steps.libjpeg.outcome == 'success' || steps.libjpeg.outcome == 'failure'
286290
continue-on-error: true
@@ -298,7 +302,7 @@ jobs:
298302
id: libwebp
299303
if: steps.vcpkg.outcome == 'success'
300304
continue-on-error: true
301-
run: ./vcpkg.exe install libwebp --triplet ${{ matrix.triplet }}
305+
run: ./vcpkg.exe install libwebp --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
302306
- name: Read libwebp config
303307
if: steps.libwebp.outcome == 'success' || steps.libwebp.outcome == 'failure'
304308
continue-on-error: true
@@ -319,7 +323,7 @@ jobs:
319323
steps.highway.outcome == 'success' &&
320324
steps.lcms.outcome == 'success'
321325
continue-on-error: true
322-
run: ./vcpkg.exe install libjxl --triplet ${{ matrix.triplet }}
326+
run: ./vcpkg.exe install libjxl --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
323327
- name: Read libjxl config
324328
if: steps.libjxl.outcome == 'success' || steps.libjxl.outcome == 'failure'
325329
continue-on-error: true
@@ -337,7 +341,7 @@ jobs:
337341
id: sqlite3
338342
if: steps.vcpkg.outcome == 'success'
339343
continue-on-error: true
340-
run: ./vcpkg.exe install sqlite3 --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
344+
run: ./vcpkg.exe install sqlite3 --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
341345
- name: Read sqlite3 config
342346
if: steps.sqlite3.outcome == 'success' || steps.sqlite3.outcome == 'failure'
343347
continue-on-error: true
@@ -355,7 +359,7 @@ jobs:
355359
id: woff2
356360
if: steps.brotli.outcome == 'success'
357361
continue-on-error: true
358-
run: ./vcpkg.exe install woff2 --triplet ${{ matrix.triplet }}
362+
run: ./vcpkg.exe install woff2 --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
359363
- name: Read woff2 config
360364
if: steps.woff2.outcome == 'success' || steps.woff2.outcome == 'failure'
361365
continue-on-error: true
@@ -373,7 +377,7 @@ jobs:
373377
id: harfbuzz
374378
if: steps.icu.outcome == 'success'
375379
continue-on-error: true
376-
run: ./vcpkg.exe install harfbuzz[core,icu,directwrite] --triplet ${{ matrix.triplet }}
380+
run: ./vcpkg.exe install harfbuzz[core,icu,directwrite] --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
377381
- name: Read harfbuzz debug config
378382
if: steps.harfbuzz.outcome == 'success' || steps.harfbuzz.outcome == 'failure'
379383
continue-on-error: true
@@ -395,7 +399,7 @@ jobs:
395399
id: pixman
396400
if: steps.icu.outcome == 'success'
397401
continue-on-error: true
398-
run: ./vcpkg.exe install pixman --triplet ${{ matrix.triplet }}
402+
run: ./vcpkg.exe install pixman --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
399403
- name: Read pixman debug config
400404
if: steps.pixman.outcome == 'success' || steps.pixman.outcome == 'failure'
401405
continue-on-error: true
@@ -417,7 +421,7 @@ jobs:
417421
id: cairo
418422
if: steps.libpng.outcome == 'success' && steps.pixman.outcome == 'success'
419423
continue-on-error: true
420-
run: ./vcpkg.exe install cairo --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
424+
run: ./vcpkg.exe install cairo --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
421425
- name: Read cairo config
422426
if: steps.cairo.outcome == 'success' || steps.cairo.outcome == 'failure'
423427
continue-on-error: true
@@ -435,7 +439,7 @@ jobs:
435439
id: libpsl
436440
if: steps.icu.outcome == 'success'
437441
continue-on-error: true
438-
run: ./vcpkg.exe install libpsl --triplet ${{ matrix.triplet }}
442+
run: ./vcpkg.exe install libpsl --overlay-ports ./WebKitRequirements/ports --overlay-triplets ./WebKitRequirements/triplets --triplet ${{ matrix.triplet }}
439443
- name: Read libpsl debug config
440444
if: steps.libpsl.outcome == 'success' || steps.libpsl.outcome == 'failure'
441445
continue-on-error: true

triplets/x64-windows-webkit.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set(VCPKG_TARGET_ARCHITECTURE x64)
2+
set(VCPKG_CRT_LINKAGE dynamic)
3+
set(VCPKG_LIBRARY_LINKAGE dynamic)
4+
5+
# The following libraries should always be static
6+
if (PORT STREQUAL "highway")
7+
set(VCPKG_LIBRARY_LINKAGE static)
8+
elseif (PORT STREQUAL "pixman")
9+
set(VCPKG_LIBRARY_LINKAGE static)
10+
endif ()

0 commit comments

Comments
 (0)