@micro-os-plus/micro-test-plus 2.1.1 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@micro-os-plus/micro-test-plus",
3
- "version": "2.1.1",
4
- "description": "A source xPack with µTest++, a minimalistic testing infrastructure",
3
+ "version": "3.0.0",
4
+ "description": "A source library xPack with µTest++, a testing framework for embedded platforms",
5
5
  "main": "",
6
6
  "scripts": {
7
7
  "npm-install": "npm install",
@@ -34,10 +34,11 @@
34
34
  "license": "MIT",
35
35
  "config": {},
36
36
  "devDependencies": {
37
- "@xpack-dev-tools/cmake": "3.20.6-2.1",
38
- "@xpack-dev-tools/meson-build": "0.59.4-1.1",
37
+ "@xpack-dev-tools/cmake": "3.21.6-1.1",
38
+ "@xpack-dev-tools/meson-build": "0.60.3-1.1",
39
39
  "@xpack-dev-tools/ninja-build": "1.10.2-5.1",
40
- "@micro-os-plus/build-helper": "2.3.1"
40
+ "@micro-os-plus/build-helper": "2.6.3",
41
+ "@micro-os-plus/diag-trace": "3.0.0"
41
42
  },
42
43
  "xpack": {
43
44
  "minimumXpmRequired": "0.11.0",
@@ -47,42 +48,48 @@
47
48
  "commandCMakePrepare": "{{ properties.commandCMakeReconfigure }} --log-level=VERBOSE",
48
49
  "commandCMakePrepareWithToolchain": "{{ properties.commandCMakePrepare }} -D CMAKE_TOOLCHAIN_FILE=../xpacks/micro-os-plus-build-helper/cmake/toolchains/{{ properties.toolchainFileName }}",
49
50
  "commandCMakeReconfigure": "cmake -S tests -B {{ properties.buildFolderRelativePathPosix }} -G Ninja -D CMAKE_BUILD_TYPE={{ properties.buildType }} -D PLATFORM_NAME={{ properties.platformName }} -D CMAKE_EXPORT_COMPILE_COMMANDS=ON",
50
- "commandCMakeBuild": "cmake --build {{ properties.buildFolderRelativePathPosix }} --verbose",
51
+ "commandCMakeBuild": "cmake --build {{ properties.buildFolderRelativePathPosix }}",
52
+ "commandCMakeBuildVerbose": "cmake --build {{ properties.buildFolderRelativePathPosix }} --verbose",
51
53
  "commandCMakeClean": "cmake --build {{ properties.buildFolderRelativePathPosix }} --target clean",
52
54
  "commandCMakePerformTests": "cd {{ properties.buildFolderRelativePath }} && ctest -V",
53
55
  "commandMesonPrepare": "meson setup --backend ninja --buildtype {{ properties.buildType }} -D platform-name={{ properties.platformName }} {{ properties.buildFolderRelativePathPosix }} tests",
54
- "commandMesonPrepareWithToolchain": "meson setup --backend ninja --buildtype {{ properties.buildType }} -D platform-name={{ properties.platformName }} --native-file xpacks/micro-os-plus-build-helper/meson/toolchains/{% if os.platform == 'win32' %}{{ properties.toolchainWindowsFileName }}{% else %}{{ properties.toolchainFileName }}{% endif %} --native-file tests/platform-{{ properties.platformName }}/meson/native.ini {{ properties.buildFolderRelativePathPosix }} tests",
55
- "commandMesonPrepareCross": "meson setup --backend ninja --buildtype {{ properties.buildType }} -D platform-name={{ properties.platformName }} --cross xpacks/micro-os-plus-build-helper/meson/toolchains/{% if os.platform == 'win32' %}{{ properties.toolchainWindowsFileName }}{% else %}{{ properties.toolchainFileName }}{% endif %} --cross tests/platform-{{ properties.platformName }}/meson/cross.ini {{ properties.buildFolderRelativePathPosix }} tests",
56
+ "commandMesonPrepareWithToolchain": "meson setup --backend ninja --buildtype {{ properties.buildType }} -D platform-name={{ properties.platformName }} --native-file xpacks/micro-os-plus-build-helper/meson/toolchains/{{ properties.toolchainFileName }} --native-file tests/platform-{{ properties.platformName }}/meson/native.ini {{ properties.buildFolderRelativePathPosix }} tests",
57
+ "commandMesonPrepareCross": "meson setup --backend ninja --buildtype {{ properties.buildType }} -D platform-name={{ properties.platformName }} --cross xpacks/micro-os-plus-build-helper/meson/toolchains/{{ properties.toolchainFileName }} --cross tests/platform-{{ properties.platformName }}/meson/cross.ini {{ properties.buildFolderRelativePathPosix }} tests",
56
58
  "commandMesonReconfigure": "meson setup --reconfigure {{ properties.buildFolderRelativePathPosix }} tests",
57
- "commandMesonBuild": "meson compile -C {{ properties.buildFolderRelativePathPosix }} --verbose",
59
+ "commandMesonBuild": "meson compile -C {{ properties.buildFolderRelativePathPosix }}",
60
+ "commandMesonBuildVerbose": "meson compile -C {{ properties.buildFolderRelativePathPosix }} --verbose",
58
61
  "commandMesonClean": "meson compile -C {{ properties.buildFolderRelativePathPosix }} --clean",
59
62
  "commandMesonPerformTests": "meson test -C {{ properties.buildFolderRelativePathPosix }} --verbose"
60
63
  },
61
64
  "actions": {
62
65
  "install-all": [
63
- "xpm install --all-configs"
66
+ "xpm install --all-configs --quiet"
64
67
  ],
65
68
  "link-deps": [
66
- "xpm link @micro-os-plus/build-helper"
69
+ "xpm link @micro-os-plus/build-helper",
70
+ "xpm link @micro-os-plus/diag-trace"
67
71
  ],
68
72
  "test-all": [
69
73
  "xpm run test-native",
70
74
  "xpm run test-cortexm"
71
75
  ],
72
76
  "test-native": [
73
- "{% if os.platform != 'win32' %}xpm run test-native-cmake{% endif %}",
74
- "xpm run test-native-cmake-gcc8",
77
+ "{% if os.platform == 'darwin' %}xpm run test-native-cmake{% endif %}",
75
78
  "xpm run test-native-cmake-gcc11",
76
79
  "xpm run test-native-cmake-clang12",
77
- "{% if os.platform != 'win32' %}xpm run test-native-meson{% endif %}",
80
+ "xpm run test-native-cmake-clang13",
81
+ "{% if os.platform == 'darwin' %}xpm run test-native-meson{% endif %}",
78
82
  "xpm run test-native-meson-gcc11",
79
- "xpm run test-native-meson-clang12"
83
+ "xpm run test-native-meson-clang12",
84
+ "xpm run test-native-meson-clang13"
80
85
  ],
81
86
  "test-cortexm": [
82
87
  "xpm run test-qemu-mps2-an386-cmake",
83
88
  "xpm run test-qemu-mps2-an386-meson",
84
- "xpm run test-stm32f4discovery-cmake",
85
- "{% if os.platform != 'win32' %}xpm run test-stm32f4discovery-meson{% endif %}"
89
+ "{% if os.platform == 'linux' %}xpm run test-stm32f4discovery-cmake{% endif %}",
90
+ "{% if os.platform == 'darwin' and os.arch == 'x64' %}xpm run test-stm32f4discovery-cmake{% endif %}",
91
+ "{% if os.platform == 'linux' %}xpm run test-stm32f4discovery-meson{% endif %}",
92
+ "{% if os.platform == 'darwin' and os.arch == 'x64' %}xpm run test-stm32f4discovery-meson{% endif %}"
86
93
  ],
87
94
  "test-native-cmake": [
88
95
  "xpm run prepare --config native-cmake-debug",
@@ -92,14 +99,6 @@
92
99
  "xpm run build --config native-cmake-release",
93
100
  "xpm run test --config native-cmake-release"
94
101
  ],
95
- "test-native-cmake-gcc8": [
96
- "xpm run prepare --config native-cmake-gcc8-debug",
97
- "xpm run build --config native-cmake-gcc8-debug",
98
- "xpm run test --config native-cmake-gcc8-debug",
99
- "xpm run prepare --config native-cmake-gcc8-release",
100
- "xpm run build --config native-cmake-gcc8-release",
101
- "xpm run test --config native-cmake-gcc8-release"
102
- ],
103
102
  "test-native-cmake-gcc11": [
104
103
  "xpm run prepare --config native-cmake-gcc11-debug",
105
104
  "xpm run build --config native-cmake-gcc11-debug",
@@ -116,6 +115,14 @@
116
115
  "xpm run build --config native-cmake-clang12-release",
117
116
  "xpm run test --config native-cmake-clang12-release"
118
117
  ],
118
+ "test-native-cmake-clang13": [
119
+ "xpm run prepare --config native-cmake-clang13-debug",
120
+ "xpm run build --config native-cmake-clang13-debug",
121
+ "xpm run test --config native-cmake-clang13-debug",
122
+ "xpm run prepare --config native-cmake-clang13-release",
123
+ "xpm run build --config native-cmake-clang13-release",
124
+ "xpm run test --config native-cmake-clang13-release"
125
+ ],
119
126
  "test-native-meson": [
120
127
  "xpm run prepare --config native-meson-debug",
121
128
  "xpm run build --config native-meson-debug",
@@ -140,6 +147,14 @@
140
147
  "xpm run build --config native-meson-clang12-release",
141
148
  "xpm run test --config native-meson-clang12-release"
142
149
  ],
150
+ "test-native-meson-clang13": [
151
+ "xpm run prepare --config native-meson-clang13-debug",
152
+ "xpm run build --config native-meson-clang13-debug",
153
+ "xpm run test --config native-meson-clang13-debug",
154
+ "xpm run prepare --config native-meson-clang13-release",
155
+ "xpm run build --config native-meson-clang13-release",
156
+ "xpm run test --config native-meson-clang13-release"
157
+ ],
143
158
  "test-qemu-mps2-an386-cmake": [
144
159
  "xpm run prepare --config qemu-mps2-an386-cmake-debug",
145
160
  "xpm run build --config qemu-mps2-an386-cmake-debug",
@@ -175,18 +190,20 @@
175
190
  "clean-all": [
176
191
  "xpm run clean --config native-cmake-debug",
177
192
  "xpm run clean --config native-cmake-release",
178
- "xpm run clean --config native-cmake-gcc8-debug",
179
- "xpm run clean --config native-cmake-gcc8-release",
180
193
  "xpm run clean --config native-cmake-gcc11-debug",
181
194
  "xpm run clean --config native-cmake-gcc11-release",
182
195
  "xpm run clean --config native-cmake-clang12-debug",
183
196
  "xpm run clean --config native-cmake-clang12-release",
197
+ "xpm run clean --config native-cmake-clang13-debug",
198
+ "xpm run clean --config native-cmake-clang13-release",
184
199
  "xpm run clean --config native-meson-debug",
185
200
  "xpm run clean --config native-meson-release",
186
201
  "xpm run clean --config native-meson-gcc11-debug",
187
202
  "xpm run clean --config native-meson-gcc11-release",
188
203
  "xpm run clean --config native-meson-clang12-debug",
189
204
  "xpm run clean --config native-meson-clang12-release",
205
+ "xpm run clean --config native-meson-clang13-debug",
206
+ "xpm run clean --config native-meson-clang13-release",
190
207
  "xpm run clean --config qemu-mps2-an386-cmake-debug",
191
208
  "xpm run clean --config qemu-mps2-an386-cmake-release",
192
209
  "xpm run clean --config qemu-mps2-an386-meson-debug",
@@ -196,21 +213,8 @@
196
213
  "xpm run clean --config stm32f4discovery-meson-debug",
197
214
  "xpm run clean --config stm32f4discovery-meson-release"
198
215
  ],
199
- "rm-global-deps": [
200
- "xpm uninstall --global @micro-os-plus/architecture-cortexm",
201
- "xpm uninstall --global @micro-os-plus/build-helper",
202
- "xpm uninstall --global @micro-os-plus/devices-stm32f4-extras",
203
- "xpm uninstall --global @micro-os-plus/devices-cortexm",
204
- "xpm uninstall --global @micro-os-plus/devices-qemu-cortexm",
205
- "xpm uninstall --global @micro-os-plus/diag-trace",
206
- "xpm uninstall --global @micro-os-plus/libs-c",
207
- "xpm uninstall --global @micro-os-plus/libs-cpp",
208
- "xpm uninstall --global @micro-os-plus/platform-stm32f4discovery",
209
- "xpm uninstall --global @micro-os-plus/semihosting",
210
- "xpm uninstall --global @micro-os-plus/startup",
211
- "xpm uninstall --global @micro-os-plus/version",
212
- "xpm uninstall --global @xpack-3rd-party/arm-cmsis-core-m"
213
- ]
216
+ "deep-clean": "rm -rf build node_modules xpacks",
217
+ "trigger-workflow-test-all": "bash tests/scripts/trigger-workflow-test-all.sh"
214
218
  },
215
219
  "buildConfigurations": {
216
220
  "native-cmake-debug": {
@@ -219,6 +223,9 @@
219
223
  "platformName": "native"
220
224
  },
221
225
  "actions": {
226
+ "link-deps": [
227
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
228
+ ],
222
229
  "prepare": "{{ properties.commandCMakePrepare }}",
223
230
  "build": [
224
231
  "{{ properties.commandCMakeReconfigure }}",
@@ -226,6 +233,9 @@
226
233
  ],
227
234
  "test": "{{ properties.commandCMakePerformTests }}",
228
235
  "clean": "{{ properties.commandCMakeClean }}"
236
+ },
237
+ "devDependencies": {
238
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
229
239
  }
230
240
  },
231
241
  "native-cmake-release": {
@@ -234,6 +244,9 @@
234
244
  "platformName": "native"
235
245
  },
236
246
  "actions": {
247
+ "link-deps": [
248
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
249
+ ],
237
250
  "prepare": "{{ properties.commandCMakePrepare }}",
238
251
  "build": [
239
252
  "{{ properties.commandCMakeReconfigure }}",
@@ -241,15 +254,21 @@
241
254
  ],
242
255
  "test": "{{ properties.commandCMakePerformTests }}",
243
256
  "clean": "{{ properties.commandCMakeClean }}"
257
+ },
258
+ "devDependencies": {
259
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
244
260
  }
245
261
  },
246
- "native-cmake-gcc8-debug": {
262
+ "native-cmake-gcc11-debug": {
247
263
  "properties": {
248
264
  "buildType": "Debug",
249
265
  "platformName": "native",
250
266
  "toolchainFileName": "gcc.cmake"
251
267
  },
252
268
  "actions": {
269
+ "link-deps": [
270
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
271
+ ],
253
272
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
254
273
  "build": [
255
274
  "{{ properties.commandCMakeReconfigure }}",
@@ -259,16 +278,20 @@
259
278
  "clean": "{{ properties.commandCMakeClean }}"
260
279
  },
261
280
  "devDependencies": {
262
- "@xpack-dev-tools/gcc": "8.5.0-1.1"
281
+ "@xpack-dev-tools/gcc": "11.2.0-3.3",
282
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
263
283
  }
264
284
  },
265
- "native-cmake-gcc8-release": {
285
+ "native-cmake-gcc11-release": {
266
286
  "properties": {
267
287
  "buildType": "Release",
268
288
  "platformName": "native",
269
289
  "toolchainFileName": "gcc.cmake"
270
290
  },
271
291
  "actions": {
292
+ "link-deps": [
293
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
294
+ ],
272
295
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
273
296
  "build": [
274
297
  "{{ properties.commandCMakeReconfigure }}",
@@ -278,16 +301,20 @@
278
301
  "clean": "{{ properties.commandCMakeClean }}"
279
302
  },
280
303
  "devDependencies": {
281
- "@xpack-dev-tools/gcc": "8.5.0-1.1"
304
+ "@xpack-dev-tools/gcc": "11.2.0-3.3",
305
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
282
306
  }
283
307
  },
284
- "native-cmake-gcc11-debug": {
308
+ "native-cmake-clang12-debug": {
285
309
  "properties": {
286
310
  "buildType": "Debug",
287
311
  "platformName": "native",
288
- "toolchainFileName": "gcc.cmake"
312
+ "toolchainFileName": "clang.cmake"
289
313
  },
290
314
  "actions": {
315
+ "link-deps": [
316
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
317
+ ],
291
318
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
292
319
  "build": [
293
320
  "{{ properties.commandCMakeReconfigure }}",
@@ -297,16 +324,20 @@
297
324
  "clean": "{{ properties.commandCMakeClean }}"
298
325
  },
299
326
  "devDependencies": {
300
- "@xpack-dev-tools/gcc": "11.2.0-1.3"
327
+ "@xpack-dev-tools/clang": "12.0.1-2.2",
328
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
301
329
  }
302
330
  },
303
- "native-cmake-gcc11-release": {
331
+ "native-cmake-clang12-release": {
304
332
  "properties": {
305
333
  "buildType": "Release",
306
334
  "platformName": "native",
307
- "toolchainFileName": "gcc.cmake"
335
+ "toolchainFileName": "clang.cmake"
308
336
  },
309
337
  "actions": {
338
+ "link-deps": [
339
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
340
+ ],
310
341
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
311
342
  "build": [
312
343
  "{{ properties.commandCMakeReconfigure }}",
@@ -316,16 +347,20 @@
316
347
  "clean": "{{ properties.commandCMakeClean }}"
317
348
  },
318
349
  "devDependencies": {
319
- "@xpack-dev-tools/gcc": "11.2.0-1.3"
350
+ "@xpack-dev-tools/clang": "12.0.1-2.2",
351
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
320
352
  }
321
353
  },
322
- "native-cmake-clang12-debug": {
354
+ "native-cmake-clang13-debug": {
323
355
  "properties": {
324
356
  "buildType": "Debug",
325
357
  "platformName": "native",
326
358
  "toolchainFileName": "clang.cmake"
327
359
  },
328
360
  "actions": {
361
+ "link-deps": [
362
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
363
+ ],
329
364
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
330
365
  "build": [
331
366
  "{{ properties.commandCMakeReconfigure }}",
@@ -335,16 +370,20 @@
335
370
  "clean": "{{ properties.commandCMakeClean }}"
336
371
  },
337
372
  "devDependencies": {
338
- "@xpack-dev-tools/clang": "12.0.1-1.2"
373
+ "@xpack-dev-tools/clang": "13.0.1-1.1",
374
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
339
375
  }
340
376
  },
341
- "native-cmake-clang12-release": {
377
+ "native-cmake-clang13-release": {
342
378
  "properties": {
343
379
  "buildType": "Release",
344
380
  "platformName": "native",
345
381
  "toolchainFileName": "clang.cmake"
346
382
  },
347
383
  "actions": {
384
+ "link-deps": [
385
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
386
+ ],
348
387
  "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
349
388
  "build": [
350
389
  "{{ properties.commandCMakeReconfigure }}",
@@ -354,7 +393,8 @@
354
393
  "clean": "{{ properties.commandCMakeClean }}"
355
394
  },
356
395
  "devDependencies": {
357
- "@xpack-dev-tools/clang": "12.0.1-1.2"
396
+ "@xpack-dev-tools/clang": "13.0.1-1.1",
397
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
358
398
  }
359
399
  },
360
400
  "native-meson-debug": {
@@ -363,6 +403,9 @@
363
403
  "platformName": "native"
364
404
  },
365
405
  "actions": {
406
+ "link-deps": [
407
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
408
+ ],
366
409
  "prepare": "{{ properties.commandMesonPrepare }}",
367
410
  "build": [
368
411
  "{{ properties.commandMesonReconfigure }}",
@@ -370,6 +413,9 @@
370
413
  ],
371
414
  "test": "{{ properties.commandMesonPerformTests }}",
372
415
  "clean": "{{ properties.commandMesonClean }}"
416
+ },
417
+ "devDependencies": {
418
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
373
419
  }
374
420
  },
375
421
  "native-meson-release": {
@@ -378,6 +424,9 @@
378
424
  "platformName": "native"
379
425
  },
380
426
  "actions": {
427
+ "link-deps": [
428
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
429
+ ],
381
430
  "prepare": "{{ properties.commandMesonPrepare }}",
382
431
  "build": [
383
432
  "{{ properties.commandMesonReconfigure }}",
@@ -385,16 +434,21 @@
385
434
  ],
386
435
  "test": "{{ properties.commandMesonPerformTests }}",
387
436
  "clean": "{{ properties.commandMesonClean }}"
437
+ },
438
+ "devDependencies": {
439
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
388
440
  }
389
441
  },
390
442
  "native-meson-gcc11-debug": {
391
443
  "properties": {
392
444
  "buildType": "debug",
393
445
  "platformName": "native",
394
- "toolchainFileName": "gcc.ini",
395
- "toolchainWindowsFileName": "gcc-cmd.ini"
446
+ "toolchainFileName": "gcc-{{ os.platform }}.ini"
396
447
  },
397
448
  "actions": {
449
+ "link-deps": [
450
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
451
+ ],
398
452
  "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
399
453
  "build": [
400
454
  "{{ properties.commandMesonReconfigure }}",
@@ -404,17 +458,20 @@
404
458
  "clean": "{{ properties.commandMesonClean }}"
405
459
  },
406
460
  "devDependencies": {
407
- "@xpack-dev-tools/gcc": "11.2.0-1.3"
461
+ "@xpack-dev-tools/gcc": "11.2.0-3.3",
462
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
408
463
  }
409
464
  },
410
465
  "native-meson-gcc11-release": {
411
466
  "properties": {
412
467
  "buildType": "release",
413
468
  "platformName": "native",
414
- "toolchainFileName": "gcc.ini",
415
- "toolchainWindowsFileName": "gcc-cmd.ini"
469
+ "toolchainFileName": "gcc-{{ os.platform }}.ini"
416
470
  },
417
471
  "actions": {
472
+ "link-deps": [
473
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
474
+ ],
418
475
  "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
419
476
  "build": [
420
477
  "{{ properties.commandMesonReconfigure }}",
@@ -424,17 +481,20 @@
424
481
  "clean": "{{ properties.commandMesonClean }}"
425
482
  },
426
483
  "devDependencies": {
427
- "@xpack-dev-tools/gcc": "11.2.0-1.3"
484
+ "@xpack-dev-tools/gcc": "11.2.0-3.3",
485
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
428
486
  }
429
487
  },
430
488
  "native-meson-clang12-debug": {
431
489
  "properties": {
432
490
  "buildType": "debug",
433
491
  "platformName": "native",
434
- "toolchainFileName": "clang.ini",
435
- "toolchainWindowsFileName": "clang-cmd.ini"
492
+ "toolchainFileName": "clang-{{ os.platform }}.ini"
436
493
  },
437
494
  "actions": {
495
+ "link-deps": [
496
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
497
+ ],
438
498
  "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
439
499
  "build": [
440
500
  "{{ properties.commandMesonReconfigure }}",
@@ -444,17 +504,66 @@
444
504
  "clean": "{{ properties.commandMesonClean }}"
445
505
  },
446
506
  "devDependencies": {
447
- "@xpack-dev-tools/clang": "12.0.1-1.2"
507
+ "@xpack-dev-tools/clang": "12.0.1-2.2",
508
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
448
509
  }
449
510
  },
450
511
  "native-meson-clang12-release": {
451
512
  "properties": {
452
513
  "buildType": "release",
453
514
  "platformName": "native",
454
- "toolchainFileName": "clang.ini",
455
- "toolchainWindowsFileName": "clang-cmd.ini"
515
+ "toolchainFileName": "clang-{{ os.platform }}.ini"
516
+ },
517
+ "actions": {
518
+ "link-deps": [
519
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
520
+ ],
521
+ "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
522
+ "build": [
523
+ "{{ properties.commandMesonReconfigure }}",
524
+ "{{ properties.commandMesonBuild }}"
525
+ ],
526
+ "test": "{{ properties.commandMesonPerformTests }}",
527
+ "clean": "{{ properties.commandMesonClean }}"
528
+ },
529
+ "devDependencies": {
530
+ "@xpack-dev-tools/clang": "12.0.1-2.2",
531
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
532
+ }
533
+ },
534
+ "native-meson-clang13-debug": {
535
+ "properties": {
536
+ "buildType": "debug",
537
+ "platformName": "native",
538
+ "toolchainFileName": "clang-{{ os.platform }}.ini"
539
+ },
540
+ "actions": {
541
+ "link-deps": [
542
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
543
+ ],
544
+ "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
545
+ "build": [
546
+ "{{ properties.commandMesonReconfigure }}",
547
+ "{{ properties.commandMesonBuild }}"
548
+ ],
549
+ "test": "{{ properties.commandMesonPerformTests }}",
550
+ "clean": "{{ properties.commandMesonClean }}"
551
+ },
552
+ "devDependencies": {
553
+ "@xpack-dev-tools/clang": "13.0.1-1.1",
554
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
555
+ }
556
+ },
557
+ "native-meson-clang13-release": {
558
+ "properties": {
559
+ "buildType": "release",
560
+ "platformName": "native",
561
+ "toolchainFileName": "clang-{{ os.platform }}.ini"
456
562
  },
457
563
  "actions": {
564
+ "link-deps": [
565
+ "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
566
+ ],
458
567
  "prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
459
568
  "build": [
460
569
  "{{ properties.commandMesonReconfigure }}",
@@ -464,7 +573,8 @@
464
573
  "clean": "{{ properties.commandMesonClean }}"
465
574
  },
466
575
  "devDependencies": {
467
- "@xpack-dev-tools/clang": "12.0.1-1.2"
576
+ "@xpack-dev-tools/clang": "13.0.1-1.1",
577
+ "@micro-os-plus/architecture-synthetic-posix": "4.0.0"
468
578
  }
469
579
  },
470
580
  "qemu-mps2-an386-cmake-debug": {
@@ -482,7 +592,6 @@
482
592
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
483
593
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
484
594
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
485
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
486
595
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
487
596
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
488
597
  "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
@@ -501,14 +610,13 @@
501
610
  "devDependencies": {
502
611
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
503
612
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
504
- "@micro-os-plus/architecture-cortexm": "4.0.1",
505
- "@micro-os-plus/devices-cortexm": "2.0.1",
506
- "@micro-os-plus/devices-qemu-cortexm": "2.0.1",
507
- "@micro-os-plus/diag-trace": "2.4.1",
508
- "@micro-os-plus/libs-c": "2.2.1",
509
- "@micro-os-plus/libs-cpp": "2.2.1",
510
- "@micro-os-plus/semihosting": "3.2.1",
511
- "@micro-os-plus/startup": "2.2.1",
613
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
614
+ "@micro-os-plus/devices-cortexm": "3.0.0",
615
+ "@micro-os-plus/devices-qemu-cortexm": "3.0.0",
616
+ "@micro-os-plus/libs-c": "3.0.0",
617
+ "@micro-os-plus/libs-cpp": "3.0.0",
618
+ "@micro-os-plus/semihosting": "4.0.0",
619
+ "@micro-os-plus/startup": "3.0.0",
512
620
  "@micro-os-plus/version": "7.1.2",
513
621
  "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
514
622
  }
@@ -527,8 +635,7 @@
527
635
  "link-deps": [
528
636
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
529
637
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
530
- "xpm link --config {{ configuration.name }} @micro-os-plus/device-qemu-cortexm",
531
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
638
+ "xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
532
639
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
533
640
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
534
641
  "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
@@ -547,14 +654,13 @@
547
654
  "devDependencies": {
548
655
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
549
656
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
550
- "@micro-os-plus/architecture-cortexm": "4.0.1",
551
- "@micro-os-plus/devices-cortexm": "2.0.1",
552
- "@micro-os-plus/devices-qemu-cortexm": "2.0.1",
553
- "@micro-os-plus/diag-trace": "2.4.1",
554
- "@micro-os-plus/libs-c": "2.2.1",
555
- "@micro-os-plus/libs-cpp": "2.2.1",
556
- "@micro-os-plus/semihosting": "3.2.1",
557
- "@micro-os-plus/startup": "2.2.1",
657
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
658
+ "@micro-os-plus/devices-cortexm": "3.0.0",
659
+ "@micro-os-plus/devices-qemu-cortexm": "3.0.0",
660
+ "@micro-os-plus/libs-c": "3.0.0",
661
+ "@micro-os-plus/libs-cpp": "3.0.0",
662
+ "@micro-os-plus/semihosting": "4.0.0",
663
+ "@micro-os-plus/startup": "3.0.0",
558
664
  "@micro-os-plus/version": "7.1.2",
559
665
  "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
560
666
  }
@@ -563,16 +669,14 @@
563
669
  "properties": {
564
670
  "buildType": "debug",
565
671
  "platformName": "qemu-mps2-an386",
566
- "toolchainFileName": "arm-none-eabi-gcc.ini",
567
- "toolchainWindowsFileName": "arm-none-eabi-gcc-cmd.ini",
672
+ "toolchainFileName": "arm-none-eabi-gcc-{{ os.platform }}.ini",
568
673
  "qemuBoardName": "QEMU mps2-an386"
569
674
  },
570
675
  "actions": {
571
676
  "link-deps": [
572
677
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
573
678
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
574
- "xpm link --config {{ configuration.name }} @micro-os-plus/device-qemu-cortexm",
575
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
679
+ "xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
576
680
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
577
681
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
578
682
  "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
@@ -591,14 +695,13 @@
591
695
  "devDependencies": {
592
696
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
593
697
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
594
- "@micro-os-plus/architecture-cortexm": "4.0.1",
595
- "@micro-os-plus/devices-cortexm": "2.0.1",
596
- "@micro-os-plus/devices-qemu-cortexm": "2.0.1",
597
- "@micro-os-plus/diag-trace": "2.4.1",
598
- "@micro-os-plus/libs-c": "2.2.1",
599
- "@micro-os-plus/libs-cpp": "2.2.1",
600
- "@micro-os-plus/semihosting": "3.2.1",
601
- "@micro-os-plus/startup": "2.2.1",
698
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
699
+ "@micro-os-plus/devices-cortexm": "3.0.0",
700
+ "@micro-os-plus/devices-qemu-cortexm": "3.0.0",
701
+ "@micro-os-plus/libs-c": "3.0.0",
702
+ "@micro-os-plus/libs-cpp": "3.0.0",
703
+ "@micro-os-plus/semihosting": "4.0.0",
704
+ "@micro-os-plus/startup": "3.0.0",
602
705
  "@micro-os-plus/version": "7.1.2",
603
706
  "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
604
707
  }
@@ -607,16 +710,14 @@
607
710
  "properties": {
608
711
  "buildType": "minsize",
609
712
  "platformName": "qemu-mps2-an386",
610
- "toolchainFileName": "arm-none-eabi-gcc.ini",
611
- "toolchainWindowsFileName": "arm-none-eabi-gcc-cmd.ini",
713
+ "toolchainFileName": "arm-none-eabi-gcc-{{ os.platform }}.ini",
612
714
  "qemuBoardName": "QEMU mps2-an386"
613
715
  },
614
716
  "actions": {
615
717
  "link-deps": [
616
718
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
617
719
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
618
- "xpm link --config {{ configuration.name }} @micro-os-plus/device-qemu-cortexm",
619
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
720
+ "xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
620
721
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
621
722
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
622
723
  "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
@@ -635,14 +736,13 @@
635
736
  "devDependencies": {
636
737
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
637
738
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
638
- "@micro-os-plus/architecture-cortexm": "4.0.1",
639
- "@micro-os-plus/devices-cortexm": "2.0.1",
640
- "@micro-os-plus/devices-qemu-cortexm": "2.0.1",
641
- "@micro-os-plus/diag-trace": "2.4.1",
642
- "@micro-os-plus/libs-c": "2.2.1",
643
- "@micro-os-plus/libs-cpp": "2.2.1",
644
- "@micro-os-plus/semihosting": "3.2.1",
645
- "@micro-os-plus/startup": "2.2.1",
739
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
740
+ "@micro-os-plus/devices-cortexm": "3.0.0",
741
+ "@micro-os-plus/devices-qemu-cortexm": "3.0.0",
742
+ "@micro-os-plus/libs-c": "3.0.0",
743
+ "@micro-os-plus/libs-cpp": "3.0.0",
744
+ "@micro-os-plus/semihosting": "4.0.0",
745
+ "@micro-os-plus/startup": "3.0.0",
646
746
  "@micro-os-plus/version": "7.1.2",
647
747
  "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
648
748
  }
@@ -659,7 +759,6 @@
659
759
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
660
760
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
661
761
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
662
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
663
762
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
664
763
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
665
764
  "xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
@@ -678,16 +777,16 @@
678
777
  "devDependencies": {
679
778
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
680
779
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
681
- "@micro-os-plus/architecture-cortexm": "4.0.1",
682
- "@micro-os-plus/devices-cortexm": "2.0.1",
780
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
781
+ "@micro-os-plus/devices-cortexm": "3.0.0",
683
782
  "@micro-os-plus/devices-stm32f4-extras": "2.2.2",
684
- "@micro-os-plus/diag-trace": "2.4.1",
685
- "@micro-os-plus/libs-c": "2.2.1",
686
- "@micro-os-plus/libs-cpp": "2.2.1",
783
+ "@micro-os-plus/libs-c": "3.0.0",
784
+ "@micro-os-plus/libs-cpp": "3.0.0",
687
785
  "@micro-os-plus/platform-stm32f4discovery": "3.3.1",
688
- "@micro-os-plus/semihosting": "3.2.1",
689
- "@micro-os-plus/startup": "2.2.1",
690
- "@micro-os-plus/version": "7.1.2"
786
+ "@micro-os-plus/semihosting": "4.0.0",
787
+ "@micro-os-plus/startup": "3.0.0",
788
+ "@micro-os-plus/version": "7.1.2",
789
+ "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
691
790
  }
692
791
  },
693
792
  "stm32f4discovery-cmake-release": {
@@ -702,7 +801,6 @@
702
801
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
703
802
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
704
803
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
705
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
706
804
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
707
805
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
708
806
  "xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
@@ -721,16 +819,16 @@
721
819
  "devDependencies": {
722
820
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
723
821
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
724
- "@micro-os-plus/architecture-cortexm": "4.0.1",
725
- "@micro-os-plus/devices-cortexm": "2.0.1",
822
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
823
+ "@micro-os-plus/devices-cortexm": "3.0.0",
726
824
  "@micro-os-plus/devices-stm32f4-extras": "2.2.2",
727
- "@micro-os-plus/diag-trace": "2.4.1",
728
- "@micro-os-plus/libs-c": "2.2.1",
729
- "@micro-os-plus/libs-cpp": "2.2.1",
825
+ "@micro-os-plus/libs-c": "3.0.0",
826
+ "@micro-os-plus/libs-cpp": "3.0.0",
730
827
  "@micro-os-plus/platform-stm32f4discovery": "3.3.1",
731
- "@micro-os-plus/semihosting": "3.2.1",
732
- "@micro-os-plus/startup": "2.2.1",
733
- "@micro-os-plus/version": "7.1.2"
828
+ "@micro-os-plus/semihosting": "4.0.0",
829
+ "@micro-os-plus/startup": "3.0.0",
830
+ "@micro-os-plus/version": "7.1.2",
831
+ "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
734
832
  }
735
833
  },
736
834
  "stm32f4discovery-meson-debug": {
@@ -746,7 +844,6 @@
746
844
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
747
845
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
748
846
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
749
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
750
847
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
751
848
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
752
849
  "xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
@@ -765,16 +862,16 @@
765
862
  "devDependencies": {
766
863
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
767
864
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
768
- "@micro-os-plus/architecture-cortexm": "4.0.1",
769
- "@micro-os-plus/devices-cortexm": "2.0.1",
865
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
866
+ "@micro-os-plus/devices-cortexm": "3.0.0",
770
867
  "@micro-os-plus/devices-stm32f4-extras": "2.2.2",
771
- "@micro-os-plus/diag-trace": "2.4.1",
772
- "@micro-os-plus/libs-c": "2.2.1",
773
- "@micro-os-plus/libs-cpp": "2.2.1",
868
+ "@micro-os-plus/libs-c": "3.0.0",
869
+ "@micro-os-plus/libs-cpp": "3.0.0",
774
870
  "@micro-os-plus/platform-stm32f4discovery": "3.3.1",
775
- "@micro-os-plus/semihosting": "3.2.1",
776
- "@micro-os-plus/startup": "2.2.1",
777
- "@micro-os-plus/version": "7.1.2"
871
+ "@micro-os-plus/semihosting": "4.0.0",
872
+ "@micro-os-plus/startup": "3.0.0",
873
+ "@micro-os-plus/version": "7.1.2",
874
+ "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
778
875
  }
779
876
  },
780
877
  "stm32f4discovery-meson-release": {
@@ -790,7 +887,6 @@
790
887
  "xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
791
888
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
792
889
  "xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
793
- "xpm link --config {{ configuration.name }} @micro-os-plus/diag-trace",
794
890
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
795
891
  "xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
796
892
  "xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
@@ -809,16 +905,16 @@
809
905
  "devDependencies": {
810
906
  "@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
811
907
  "@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
812
- "@micro-os-plus/architecture-cortexm": "4.0.1",
813
- "@micro-os-plus/devices-cortexm": "2.0.1",
908
+ "@micro-os-plus/architecture-cortexm": "5.0.0",
909
+ "@micro-os-plus/devices-cortexm": "3.0.0",
814
910
  "@micro-os-plus/devices-stm32f4-extras": "2.2.2",
815
- "@micro-os-plus/diag-trace": "2.4.1",
816
- "@micro-os-plus/libs-c": "2.2.1",
817
- "@micro-os-plus/libs-cpp": "2.2.1",
911
+ "@micro-os-plus/libs-c": "3.0.0",
912
+ "@micro-os-plus/libs-cpp": "3.0.0",
818
913
  "@micro-os-plus/platform-stm32f4discovery": "3.3.1",
819
- "@micro-os-plus/semihosting": "3.2.1",
820
- "@micro-os-plus/startup": "2.2.1",
821
- "@micro-os-plus/version": "7.1.2"
914
+ "@micro-os-plus/semihosting": "4.0.0",
915
+ "@micro-os-plus/startup": "3.0.0",
916
+ "@micro-os-plus/version": "7.1.2",
917
+ "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
822
918
  }
823
919
  }
824
920
  }