| ... |
... |
@@ -54,17 +54,7 @@ variables: |
|
54
|
54
|
# Make sure meson is up to date so we don't need to rebuild the image
|
|
55
|
55
|
# with each release.
|
|
56
|
56
|
- pip3 install -U 'meson==0.59.*'
|
|
57
|
|
- - pip3 install --upgrade certifi
|
|
58
|
57
|
- pip3 install -U ninja
|
|
59
|
|
-
|
|
60
|
|
- # Generate a UWP cross-file in case it's used
|
|
61
|
|
- - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
|
|
62
|
|
- - echo "[binaries]" > uwp-crossfile.meson
|
|
63
|
|
- - echo "c = 'cl'" >> uwp-crossfile.meson
|
|
64
|
|
- - echo "strip = ['true']" >> uwp-crossfile.meson
|
|
65
|
|
- - echo "[built-in options]" >> uwp-crossfile.meson
|
|
66
|
|
- - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
|
|
67
|
|
- - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
|
|
68
|
58
|
script:
|
|
69
|
59
|
# For some reason, options are separated by newlines instead of spaces,
|
|
70
|
60
|
# so we have to replace them first.
|
| ... |
... |
@@ -75,10 +65,12 @@ variables: |
|
75
|
65
|
# script. Environment variables substitutions is done by PowerShell
|
|
76
|
66
|
# before calling `cmd.exe`, that's why we use `$env:FOO` instead of
|
|
77
|
67
|
# `%FOO%`.
|
|
78
|
|
- - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
|
|
79
|
|
- meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
|
|
80
|
|
- meson compile --verbose -C build
|
|
81
|
|
- $env:MESON_WINDOWS_TESTS"
|
|
|
68
|
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
|
|
|
69
|
+ meson setup build $env:MESON_ARGS_WINDOWS &&
|
|
|
70
|
+ meson compile --verbose -C build &&
|
|
|
71
|
+ meson test -C build &&
|
|
|
72
|
+ meson test -C build --benchmark"
|
|
|
73
|
+
|
|
82
|
74
|
|
|
83
|
75
|
.build windows msbuild:
|
|
84
|
76
|
extends: '.build windows common'
|
| ... |
... |
@@ -106,20 +98,11 @@ windows meson vs2019 amd64: |
|
106
|
98
|
extends: '.build windows meson'
|
|
107
|
99
|
variables:
|
|
108
|
100
|
ARCH: 'amd64'
|
|
109
|
|
- MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
|
|
110
|
101
|
|
|
111
|
102
|
windows meson vs2019 x86:
|
|
112
|
103
|
extends: '.build windows meson'
|
|
113
|
104
|
variables:
|
|
114
|
105
|
ARCH: 'x86'
|
|
115
|
|
- MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
|
|
116
|
|
-
|
|
117
|
|
-windows meson vs2019 amd64 uwp:
|
|
118
|
|
- extends: '.build windows meson'
|
|
119
|
|
- variables:
|
|
120
|
|
- ARCH: 'amd64'
|
|
121
|
|
- VS_UWP: '-app_platform=UWP'
|
|
122
|
|
- MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'
|
|
123
|
106
|
|
|
124
|
107
|
windows msbuild vs2019 amd64:
|
|
125
|
108
|
extends: '.build windows msbuild'
|