... |
... |
@@ -48,7 +48,17 @@ variables: |
48
|
48
|
# Make sure meson is up to date so we don't need to rebuild the image
|
49
|
49
|
# with each release.
|
50
|
50
|
- pip3 install meson==0.59.1
|
|
51
|
+ - pip3 install --upgrade certifi
|
51
|
52
|
- pip3 install -U ninja
|
|
53
|
+
|
|
54
|
+ # Generate a UWP cross-file in case it's used
|
|
55
|
+ - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
|
|
56
|
+ - echo "[binaries]" > uwp-crossfile.meson
|
|
57
|
+ - echo "c = 'cl'" >> uwp-crossfile.meson
|
|
58
|
+ - echo "strip = ['true']" >> uwp-crossfile.meson
|
|
59
|
+ - echo "[built-in options]" >> uwp-crossfile.meson
|
|
60
|
+ - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
|
|
61
|
+ - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
|
52
|
62
|
script:
|
53
|
63
|
# For some reason, options are separated by newlines instead of spaces,
|
54
|
64
|
# so we have to replace them first.
|
... |
... |
@@ -59,11 +69,10 @@ variables: |
59
|
69
|
# script. Environment variables substitutions is done by PowerShell
|
60
|
70
|
# before calling `cmd.exe`, that's why we use `$env:FOO` instead of
|
61
|
71
|
# `%FOO%`.
|
62
|
|
- - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
|
63
|
|
- meson setup build $env:MESON_ARGS_WINDOWS &&
|
64
|
|
- meson compile --verbose -C build &&
|
65
|
|
- meson test -C build &&
|
66
|
|
- meson test -C build --benchmark"
|
|
72
|
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
|
|
73
|
+ meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
|
|
74
|
+ meson compile --verbose -C build
|
|
75
|
+ $env:MESON_WINDOWS_TESTS"
|
67
|
76
|
|
68
|
77
|
|
69
|
78
|
# Format of job names:
|
... |
... |
@@ -76,12 +85,20 @@ windows meson vs2017 amd64: |
76
|
85
|
extends: '.build windows meson'
|
77
|
86
|
variables:
|
78
|
87
|
ARCH: 'amd64'
|
|
88
|
+ MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
|
79
|
89
|
|
80
|
90
|
windows meson vs2017 x86:
|
81
|
91
|
extends: '.build windows meson'
|
82
|
92
|
variables:
|
83
|
93
|
ARCH: 'x86'
|
|
94
|
+ MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
|
84
|
95
|
|
|
96
|
+windows meson vs2017 amd64 uwp:
|
|
97
|
+ extends: '.build windows meson'
|
|
98
|
+ variables:
|
|
99
|
+ ARCH: 'amd64'
|
|
100
|
+ VS_UWP: '-app_platform=UWP'
|
|
101
|
+ MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'
|
85
|
102
|
|
86
|
103
|
# Linux Jobs.
|
87
|
104
|
#
|