Skip to content

Commit

Permalink
Merge pull request #222 from toradex/next
Browse files Browse the repository at this point in the history
Next to Dev
  • Loading branch information
microhobby authored Aug 30, 2024
2 parents aff0dba + d416b2c commit 48496ef
Show file tree
Hide file tree
Showing 333 changed files with 8,020 additions and 8,900 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-ccpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-debug-ccpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-debug-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-debug-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
docker run --rm --privileged torizon/binfmt
./.vscode/tasks.ps1 run run-torizon-binfmt
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/ci-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ on:
push:
branches:
- dev
- bookworm
pull_request:
branches:
- dev

jobs:
spell-check:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/bookworm' || github.ref == 'refs/heads/dev'
container:
image: node:18
name: Spell Check
Expand All @@ -22,3 +23,16 @@ jobs:
run: |
npm install git+https://github.com/streetsidesoftware/cspell-cli
npx cspell-cli lint --relative
check-eof-new-line:
runs-on: ubuntu-latest
name: Check EOF New Line
steps:
- uses: actions/checkout@v3

- name: Check EOF New Line

shell: pwsh

run: |
./scripts/validNewLine.ps1
19 changes: 18 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,23 @@
}
],
"tasksLabel.includeFiles": [
"assets/tasks/common.json"
"assets/tasks/common.json",
// "cConsole/.vscode/tasks.json",
// "cppConsole/.vscode/tasks.json",
// "cmakeConsole/.vscode/tasks.json",
// "gambasForms/.vscode/tasks.json",
// "aspnetBlazor/.vscode/tasks.json",
// "python3Console/.vscode/tasks.json",
// "python3Pyside2QML/.vscode/tasks.json",
// "cppQML/.vscode/tasks.json",
// "javaForms/.vscode/tasks.json",
// "monoCsharpForms/.vscode/tasks.json",
// "dotnetSlint/.vscode/tasks.json",
// "dotnetAvaloniaFrameBuffer/.vscode/tasks.json",
// "dotnetAvalonia/.vscode/tasks.json",
// "dotnetUno5/.vscode/tasks.json",
// "dotnetUno5FrameBuffer/.vscode/tasks.json",
// "cppSlint/.vscode/tasks.json",
"tcb/.vscode/tasks.json"
]
}
22 changes: 21 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
},
"group": "build"
},
{
"label": "check-eof-new-line",
"command": "pwsh",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}"
},
"args": [
"-nop",
"-f",
"./scripts/validNewLine.ps1"
],
"problemMatcher": [
"$gcc"
],
"presentation": {
"reveal": "always"
},
"group": "build"
},
{
"label": "install-cspell",
"command": "npm",
Expand Down Expand Up @@ -69,7 +89,7 @@
"type": "shell",
"command": "git",
"args": [
"checkout",
"checkout",
"bullseye",
"&&",
"git",
Expand Down
24 changes: 10 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Torizon IDE Extension project templates are in their nature VS Code workspaces,
![](https://github.com/toradex/vscode-torizon-templates/blob/dev/assets/img/vscodetasksDiagram.png?raw=true&v=6)

> ⚠️ To trigger the Torizon IDE Extension `build/deploy start` event the first dependency tasks from the pipeline needs to be labeled `validate-settings-*`.
>
>
> Check the common tasks to use the right validate settings task for the architecture that is being added [assets/tasks/common.json](./assets/tasks/common.json)
> ⚠️ To trigger the Torizon IDE Extension `build/deploy end` event the last task to be executed from the pipeline needs to be labeled `deploy-torizon-*`.
Expand Down Expand Up @@ -83,15 +83,15 @@ Substitution tags can be used inside files and as folders names to rename stuff
In the `.vscode` folder the following files are expected:

- `settings.json`: define configurations about the host and the target device;

- ```json
{
"torizon_psswd": "", // remote device psswd
"torizon_login": "", // remote device login
"torizon_ip": "", // remote device hostname or ip address
"host_ip": "", // development pc ip address
"torizon_workspace": "${workspaceFolder}",
"torizon_debug_port": "", // debug port used by the framework
"torizon_debug_port1": "", // debug port used by the framework
"torizon_debug_ssh_port": "2230", // ssh port used by debug container
"torizon_debug_port2": "", // second port used by the framework
"torizon_debug_port3": "", // third port used by the framework
Expand All @@ -112,12 +112,8 @@ In the `.vscode` folder the following files are expected:

In the `.conf` folder the following files are expected:

- `id_rsa`: private key used for debug purposes, to remote deploy/debug the application inside a container;

- `id_rsa.pub`: public key used for debug purposes, to remote deploy/debug the application inside a container;

- `deps.json`: define an array with the Debian/Ubuntu packages that are dependency for compile and/or run the application locally. Torizon IDE Extension extension will check and will try to install it if they are not installed:

- ```json
{
"packages": [
Expand All @@ -135,9 +131,9 @@ In the `.conf` folder the following files are expected:

#### Dot Doc Folder

In the `.doc` folder is present the documentation specific of each template.
In the `.doc` folder is present the documentation specific of each template.

This documentation should give some explanation of how the code is being built and deployed to the application, how it is being debugged and where did its source code come from. Also, there should be present any information specific from that template, warnings, recommendations and tasks specific from that template and how to use them. You can add any information that you believe is relevant to the template there. The file containing this information has to be the `README.md` file.
This documentation should give some explanation of how the code is being built and deployed to the application, how it is being debugged and where did its source code come from. Also, there should be present any information specific from that template, warnings, recommendations and tasks specific from that template and how to use them. You can add any information that you believe is relevant to the template there. The file containing this information has to be the `README.md` file.

> ℹ️ Check the [cppQML/.doc/README.md](./cppQML/.doc/README.md) to see an example.

Expand All @@ -155,13 +151,13 @@ For Torizon IDE Extension project templates we are using [GitHub platform](https
- Create a new development branch for your contributions;

- Follow this commits format:

- ```git
<template Folder>: <description>

[optional body] <detailed description>


Signed-off-by: [email protected]
```

Expand Down
8 changes: 8 additions & 0 deletions DEPRECATED.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Deprecated templates

Due to the eminent EOL of .NET 6, .NET 6 Uno and .NET 6 Uno FrameBuffer templates are deprecated, being replaced by the [.NET 8 Uno 5](./dotnetUno5) and [.NET 8 Uno 5 FrameBuffer](./dotnetUno5FrameBuffer) templates.

Due to the quite big difference between .NET 6 Uno 4 and .NET 8 Uno 5, it is not possible to update the project via `try-update-template` task. To update it, create a new .NET 8 Uno 5 clean project and update the source files accordingly.

| ![](assets/img/unogtk.png?raw=true) | .NET 6 C# Uno Platform Skia.GTK | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [dotnetUno](./dotnetUno) |
| ![](assets/img/unofbdrm.png?raw=true) | .NET 6 C# Uno Platform Frame Buffer | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUnoFrameBuffer](./dotnetUnoFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ This repository maintains the templates used in conjunction with the [VS Code To
| ![](assets/img/cmakeconsole.png?raw=true) | C++ CMake Console Application | libc | C++ | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  | [cmakeConsole](./cmakeConsole) |
| ![](assets/img/qt6qml.png?raw=true) | C++ Qt 6 QML Application | Qt 6 | C++ / QML | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [cppQML](./cppQML) |
| ![](assets/img/dotnetconsole.png?raw=true) | .NET 8 C# Console Application | .NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [dotnetConsole](./dotnetConsole) |
| ![](assets/img/unogtk.png?raw=true) | .NET 6 C# Uno Platform Skia.GTK | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [dotnetUno](./dotnetUno) |
| ![](assets/img/aspnetblazor.png?raw=true) | ASP.NET 8 Blazor Application | ASP.NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [aspnetBlazor](./aspnetBlazor) |
| ![](assets/img/python3console.png?raw=true) | Python 3 Console Application | Python 3 | Python 3 | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [python3Console](./python3Console) |
| ![](assets/img/genericTemplate.png?raw=true)| Generic Template (Without Language) | None | None | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) ![](assets/img/riscv64.png?raw=true&id=2) ![](assets/img/x8664.png?raw=true&id=2) | [genericTemplate](./genericTemplate) |
Expand Down Expand Up @@ -50,7 +49,6 @@ We encourage you to also contribute templates. The community supported templates
| ![](assets/img/nodejsts.png?raw=true) | Node.js TypeScript Application | Node.js | TypeScript | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [nodeJSTypeScript](./nodeJSTypeScript) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/electronjs.png?raw=true) | Node.js JavaScript Electron Application | Electron | JavaScript | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [nodeElectron](./nodeElectron) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/monowinforms.png?raw=true) | Mono 4.7 C# Windows Forms Application | .NET 4.7 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [monoCsharpForms](./monoCsharpForms) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/unofbdrm.png?raw=true) | .NET 6 C# Uno Platform Frame Buffer | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUnoFrameBuffer](./dotnetUnoFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/avaloniafbdrm.png?raw=true) | .NET 8 C# Avalonia Frame Buffer DRM | .NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvaloniaFrameBuffer](./dotnetAvaloniaFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/avaloniagtk.png?raw=true) | .NET 8 C# Avalonia GTK MVVM | .NET 8.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetAvalonia](./dotnetAvalonia) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/gambasform.png?raw=true) | Gambas3 Form Project | Gambas3 | Visual Basic | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [gambasForms](./gambasForms) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
Expand All @@ -59,3 +57,12 @@ We encourage you to also contribute templates. The community supported templates
| ![](assets/img/zig-console.png?raw=true) | Zig Console Application | no-libc | Zig | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [zigConsole](./zigConsole) | ![](https://avatars.githubusercontent.com/u/6756180?v=4) [@kassane](https://www.github.com/kassane) |
| ![](assets/img/unogtk5.png?raw=true) | Java Swing JFrame Application | .NET 8.0 | C# | ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUno5](./dotnetUno5) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |
| ![](assets/img/unofbdrm5.png?raw=true) | Node.js TypeScript Application | .NET 8.0 | C# | ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUno5FrameBuffer](./dotnetUno5FrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |


# List of Deprecated templates

| ![](assets/img/unogtk.png?raw=true) | .NET 6 C# Uno Platform Skia.GTK | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2)  ![](assets/img/x8664.png?raw=true&id=2) | [dotnetUno](./dotnetUno) |
| ![](assets/img/unofbdrm.png?raw=true) | .NET 6 C# Uno Platform Frame Buffer | .NET 6.0 | C# | ![](assets/img/arm32.png?raw=true&id=2) ![](assets/img/arm64.png?raw=true&id=2) | [dotnetUnoFrameBuffer](./dotnetUnoFrameBuffer) | ![](https://avatars.githubusercontent.com/u/2633321?v=4) [@microhobby](https://www.github.com/microhobby) |


For the reason of deprecation and how to proceed with the update of this template, please check the [DEPRECATED.md file](./DEPRECATED.md).
8 changes: 0 additions & 8 deletions aspnetBlazor/.conf/update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
"source": "__change__.csproj",
"target": "$projectName.csproj"
},
{
"source": ".vscode/settings.json",
"target": ".vscode/settings.json"
},
{
"source": ".vscode/launch.json",
"target": ".vscode/launch.json"
},
{
"source": "_Imports.razor",
"target": "_Imports.razor"
Expand Down
Loading

0 comments on commit 48496ef

Please sign in to comment.