Skip to content

Commit cbcbcde

Browse files
microhobbymicrohobby
authored
Merge pull request torizon#214 from toradex/dev
Release v2.5.2
2 parents b6bc001 + f31c8d7 commit cbcbcde

File tree

8 files changed

+204
-5
lines changed

8 files changed

+204
-5
lines changed

‎cmakeConsole/.vscode/launch.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,52 @@
2626
],
2727
"preLaunchTask": "build-debug-amd64-local"
2828
},
29+
{
30+
"name": "Torizon AMD64",
31+
"type": "cppdbg",
32+
"request": "launch",
33+
"program": "${config:torizon_app_root}/__change__",
34+
"args": [],
35+
"stopAtEntry": false,
36+
"cwd": "${config:torizon_app_root}",
37+
"environment": [],
38+
"externalConsole": false,
39+
"internalConsoleOptions": "openOnSessionStart",
40+
"sourceFileMap": {
41+
"${config:torizon_app_root}": "${workspaceFolder}"
42+
},
43+
"pipeTransport": {
44+
"debuggerPath": "/usr/bin/gdb",
45+
"pipeProgram": "ssh",
46+
"pipeArgs": [
47+
"-T",
48+
"-q",
49+
"-p",
50+
"${config:torizon_debug_ssh_port}",
51+
"-i",
52+
"${workspaceFolder}/.conf/id_rsa", // ssh key path
53+
"-o",
54+
"StrictHostKeyChecking=no",
55+
"-o",
56+
"UserKnownHostsFile /dev/null",
57+
"${config:torizon_run_as}@${config:torizon_ip}" // user@device
58+
]
59+
},
60+
"MIMode": "gdb",
61+
"setupCommands": [
62+
{
63+
"description": "Enable pretty-printing for gdb",
64+
"text": "-enable-pretty-printing",
65+
"ignoreFailures": true
66+
},
67+
{
68+
"description": "Set Disassembly Flavor to Intel",
69+
"text": "-gdb-set disassembly-flavor intel",
70+
"ignoreFailures": true
71+
}
72+
],
73+
"preLaunchTask": "deploy-torizon-amd64"
74+
},
2975
{
3076
"name": "Torizon ARMv7",
3177
"type": "cppdbg",

‎cmakeConsole/.vscode/tasks.json

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,121 @@
288288
"build-container-image-sdk-arm64"
289289
]
290290
},
291+
{
292+
"label": "build-configure-amd64",
293+
"hide": true,
294+
"command": "DOCKER_HOST=",
295+
"type": "shell",
296+
"args": [
297+
"docker",
298+
"run",
299+
"--rm",
300+
"-v",
301+
"${workspaceFolder}:${config:torizon_app_root}",
302+
"cross-toolchain-amd64-__container__",
303+
"cmake",
304+
"-DCMAKE_BUILD_TYPE=Debug",
305+
"-DCMAKE_CXX_COMPILER=x86_64-linux-gnu-g++",
306+
"-DCMAKE_C_COMPILER=x86_64-linux-gnu-gcc",
307+
"-Bbuild-amd64"
308+
],
309+
"problemMatcher": [
310+
"$gcc"
311+
],
312+
"icon": {
313+
"id": "flame",
314+
"color": "terminal.ansiYellow"
315+
},
316+
"dependsOrder": "sequence",
317+
"dependsOn": [
318+
"build-container-image-sdk-amd64"
319+
]
320+
},
321+
{
322+
"label": "build-debug-amd64",
323+
"detail": "Build a debug version of the application for amd64 using\nthe toolchain from the SDK container.",
324+
"command": "DOCKER_HOST=",
325+
"type": "shell",
326+
"args": [
327+
"docker",
328+
"run",
329+
"--rm",
330+
"-v",
331+
"${workspaceFolder}:${config:torizon_app_root}",
332+
"cross-toolchain-amd64-__container__",
333+
"cmake",
334+
"--build",
335+
"build-amd64"
336+
],
337+
"problemMatcher": [
338+
"$gcc"
339+
],
340+
"icon": {
341+
"id": "flame",
342+
"color": "terminal.ansiYellow"
343+
},
344+
"dependsOrder": "sequence",
345+
"dependsOn": [
346+
"build-configure-amd64"
347+
]
348+
},
349+
{
350+
"label": "deploy-torizon-amd64",
351+
"detail": "",
352+
"hide": true,
353+
"command": "sleep",
354+
"type": "process",
355+
"args": [
356+
"1"
357+
],
358+
"dependsOn": [
359+
"validate-settings",
360+
"validate-arch-amd64",
361+
"copy-docker-compose",
362+
"pre-cleanup",
363+
"build-debug-amd64",
364+
"build-container-torizon-debug-amd64",
365+
"push-container-torizon-debug-amd64",
366+
"pull-container-torizon-debug-amd64",
367+
"run-container-torizon-debug-amd64"
368+
],
369+
"dependsOrder": "sequence",
370+
"problemMatcher": "$msCompile",
371+
"icon": {
372+
"id": "flame",
373+
"color": "terminal.ansiYellow"
374+
}
375+
},
376+
{
377+
"label": "clean-amd64",
378+
"detail": "Clean the build folder for amd64 using the\ncontainer SDK toolchain.",
379+
"command": "DOCKER_HOST=",
380+
"type": "shell",
381+
"args": [
382+
"docker",
383+
"run",
384+
"--rm",
385+
"-v",
386+
"${workspaceFolder}:${config:torizon_app_root}",
387+
"cross-toolchain-amd64-__container__",
388+
"cmake",
389+
"--build",
390+
"build-amd64",
391+
"--target",
392+
"clean"
393+
],
394+
"problemMatcher": [
395+
"$gcc"
396+
],
397+
"icon": {
398+
"id": "trash",
399+
"color": "terminal.ansiYellow"
400+
},
401+
"dependsOrder": "sequence",
402+
"dependsOn": [
403+
"build-container-image-sdk-arm64"
404+
]
405+
},
291406
],
292407
"inputs": []
293408
}

‎cmakeConsole/Dockerfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,16 @@ RUN cmake --build build-${IMAGE_ARCH}
4949
# BUILD ------------------------------------------------------------------------
5050

5151

52-
# DEPLOY -----------------------------------------------------------------------
53-
FROM --platform=linux/${IMAGE_ARCH} torizon/debian:${BASE_VERSION} AS Deploy
52+
##
53+
# Deploy Step
54+
#
55+
# This is using commontorizon/debian only by the ease of the use of the
56+
# same image tags for x86_64 architectures:
57+
# - AMD64 -> torizon/debian-upstream:3 == commontorizon/debian:3.3.0-bookworm
58+
# - ARM64 -> torizon/debian:3 == commontorizon/debian:3.3.0-bookworm
59+
# - ARM -> torizon/debian:3 == commontorizon/debian:3.3.0-bookworm
60+
##
61+
FROM --platform=linux/${IMAGE_ARCH} commontorizon/debian:${BASE_VERSION} AS Deploy
5462

5563
ARG IMAGE_ARCH
5664
ARG APP_ROOT

‎cmakeConsole/Dockerfile.debug

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ ARG APP_ROOT=
2929
# BUILD ------------------------------------------------------------------------
3030
##
3131
# Deploy Step
32+
#
33+
# This is using commontorizon/debian only by the ease of the use of the
34+
# same image tags for x86_64 architectures:
35+
# - AMD64 -> torizon/debian-upstream:3 == commontorizon/debian:3.3.0-bookworm
36+
# - ARM64 -> torizon/debian:3 == commontorizon/debian:3.3.0-bookworm
37+
# - ARM -> torizon/debian:3 == commontorizon/debian:3.3.0-bookworm
3238
##
3339
FROM --platform=linux/${IMAGE_ARCH} \
34-
torizon/debian:${BASE_VERSION} AS Debug
40+
commontorizon/debian:${BASE_VERSION} AS Debug
3541

3642
ARG IMAGE_ARCH
3743
ARG SSH_DEBUG_PORT

‎python3Console/.conf/update.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,17 @@
22
{
33
"source": ".vscode/launch.json",
44
"target": ".vscode/launch.json"
5+
},
6+
{
7+
"source": "requirements-local.txt",
8+
"target": "requirements-local.txt"
9+
},
10+
{
11+
"source": "requirements-debug.txt",
12+
"target": "requirements-debug.txt"
13+
},
14+
{
15+
"source": "requirements-release.txt",
16+
"target": "requirements-release.txt"
517
}
618
]

‎python3Pyside2QML/.conf/update.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,17 @@
22
{
33
"source": ".vscode/launch.json",
44
"target": ".vscode/launch.json"
5+
},
6+
{
7+
"source": "requirements-local.txt",
8+
"target": "requirements-local.txt"
9+
},
10+
{
11+
"source": "requirements-debug.txt",
12+
"target": "requirements-debug.txt"
13+
},
14+
{
15+
"source": "requirements-release.txt",
16+
"target": "requirements-release.txt"
517
}
618
]

‎scripts/createDockerComposeMultiProduction.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ foreach ($project in $codeWorkspace.folders) {
3939
"Reading $path/docker-compose.prod.yml"
4040

4141
$yamlFile = Get-Content ("$path/docker-compose.prod.yml") | Out-String
42-
$yamlObj = ConvertFrom-Yaml $yamlFile -AllDocuments
42+
$yamlObj = ConvertFrom-Yaml $yamlFile -AllDocuments -Ordered
4343

4444
if ($null -eq $retYaml) {
4545
$retYaml = $yamlObj

‎scripts/createDockerComposeProduction.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Write-Host -ForegroundColor DarkGreen "✅ powershell-yaml loaded"
166166
# read the yaml file
167167
Write-Host "Reading docker-compose.yml file ..."
168168
$composeContent = Get-Content ("$compoFilePath/docker-compose.yml") | Out-String
169-
$composeLoad = ConvertFrom-Yaml $composeContent -AllDocuments
169+
$composeLoad = ConvertFrom-Yaml $composeContent -AllDocuments -Ordered
170170
$composeServices = $composeLoad.Services
171171
$removeKeys = New-Object Collections.Generic.List[String]
172172
$prodKeys = New-Object Collections.Generic.List[String]

0 commit comments

Comments
 (0)