Skip to content

Commit

Permalink
Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@brondani
brondani committed Nov 28, 2023
1 parent fc3ca0b commit ee72d68
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 13 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/toolbox.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Open-CMSIS-Pack/devtools"
version: tags/tools/buildmgr/2.1.0
version: tags/tools/buildmgr/2.2.0
file: cbuild_install.sh
target: toolbox/cbuild/cbuild_install.sh
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -99,36 +99,42 @@ jobs:
cp distribution/bin/cbuild.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/cbuild.exe
cp distribution/bin/cbuildgen.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/cbuildgen.exe
cp distribution/bin/cpackget.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/cpackget.exe
cp distribution/bin/cbridge.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/cbridge.exe
cp distribution/bin/csolution.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/csolution.exe
cp distribution/bin/packchk.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/packchk.exe
cp distribution/bin/svdconv.exe-amd64 zip/cmsis-toolbox-windows-amd64/bin/svdconv.exe
cp distribution/bin/cbuild.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cbuild.exe
cp distribution/bin/cbuildgen.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cbuildgen.exe
cp distribution/bin/cpackget.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cpackget.exe
cp distribution/bin/cbridge.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cbridge.exe
cp distribution/bin/csolution.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/csolution.exe
cp distribution/bin/packchk.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/packchk.exe
cp distribution/bin/svdconv.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/svdconv.exe
cp distribution/bin/cbuild.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cbuild
cp distribution/bin/cbuildgen.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cbuildgen
cp distribution/bin/cpackget.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cpackget
cp distribution/bin/cbridge.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cbridge
cp distribution/bin/csolution.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/csolution
cp distribution/bin/packchk.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/packchk
cp distribution/bin/svdconv.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/svdconv
cp distribution/bin/cbuild.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/cbuild
cp distribution/bin/cbuildgen.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/cbuildgen
cp distribution/bin/cpackget.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/cpackget
cp distribution/bin/cbridge.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/cbridge
cp distribution/bin/csolution.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/csolution
cp distribution/bin/packchk.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/packchk
cp distribution/bin/svdconv.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/svdconv
cp distribution/bin/cbuild.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/cbuild
cp distribution/bin/cbuildgen.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/cbuildgen
cp distribution/bin/cpackget.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/cpackget
cp distribution/bin/cbridge.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/cbridge
cp distribution/bin/csolution.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/csolution
cp distribution/bin/packchk.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/packchk
cp distribution/bin/svdconv.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/svdconv
cp distribution/bin/cbuild.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cbuild
cp distribution/bin/cbuildgen.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cbuildgen
cp distribution/bin/cpackget.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cpackget
cp distribution/bin/cbridge.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cbridge
cp distribution/bin/csolution.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/csolution
cp distribution/bin/packchk.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/packchk
cp distribution/bin/svdconv.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/svdconv
Expand Down
12 changes: 6 additions & 6 deletions docs/build-overview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,12 +800,12 @@ The file `regions_<device_or_board>.h` can be modified by the user as it might b

The following compiler specific Linker Script files are used when no explicit file is specified. The files are located in the directory `<cmsis-toolbox-installation-dir>/etc` of the CMSIS-Toolbox.

Linker Script Template | Linker control file for ...
:-----------------------|:-----------------------------
ac6_linker_script.sct | Arm Compiler
gcc_linker_script.ld | GCC Compiler
iar_linker_script.icf | IAR Compiler
clang_linker_script.ld | CLANG Compiler (experimental)
Linker Script Template | Linker control file for ...
:---------------------------|:-----------------------------
ac6_linker_script.sct.src | Arm Compiler
gcc_linker_script.ld.src | GCC Compiler
iar_linker_script.icf.src | IAR Compiler
clang_linker_script.ld.src | CLANG Compiler (experimental)

## Generator Support

Expand Down
10 changes: 8 additions & 2 deletions docs/progress.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ access sequences handling in cbuild
list commands at csolution and context level | :heavy_check_mark: | csolution 0.9.1
csolution `context` input parameter | :heavy_check_mark: | csolution 0.9.1
generator commands: `list generators` and `run --generator <id>` | :heavy_check_mark: | csolution 0.9.1
generator component extensions | :heavy_multiplication_x: | in progress
automatic schema checking | :heavy_check_mark: | csolution 0.9.1
config files PLM | :heavy_check_mark: | csolution 0.9.2
pack selection: `pack` keyword in csolution | :heavy_check_mark: | csolution 0.9.2
Expand Down Expand Up @@ -78,7 +77,14 @@ alpha support for LLVM/Clang in csolution
add `list configs` command to list configuration files | :heavy_check_mark: | csolution 2.1.0
add license information to `cbuild.yml` | :heavy_check_mark: | csolution 2.1.0
support dry-running generators | :heavy_check_mark: | csolution 2.1.0
add option `--context-replacement` to refine context selection | :heavy_check_mark: | cbuild 2.1.0
support for simplified global generators | :heavy_check_mark: | csolution 2.2.0
support for `*.cbuild-pack.yml` lock file mechanism | :heavy_check_mark: | csolution 2.2.0
support for branch protection (PACBTI) | :heavy_check_mark: | csolution 2.2.0
add option `--context-set` to handle selected contexts `*.cbuild-set.yml` | :heavy_check_mark: | csolution 2.2.0
add `auto` node for automatic linker script generation | :heavy_check_mark: | csolution 2.2.0
processor attributes `trustzone`, `fpu`, `dsp`, `mve`, `endian` and `branch-protection` | :heavy_check_mark: | csolution 2.2.0
alpha support for LLVM/Clang updated to 17.0.1 | :heavy_check_mark: | cbuild 2.2.0
add `*.src` file extension as linker script source for pre-processing | :heavy_check_mark: | cbuild 2.2.0
resources management | :x: |
execution groups/phases | :x: |
pre/post build steps in csolution | :x: |
Expand Down
8 changes: 4 additions & 4 deletions test/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ def test_check_archive(base_path):
"{{ProjectName}}.cproject.yml",
"{{SolutionName}}.csolution.yml",
"AC6.6.18.0.cmake",
"ac6_linker_script.sct",
"ac6_linker_script.sct.src",
"cbuild.schema.json",
"cdefault.schema.json",
"cdefault.yml",
"CLANG.17.0.1.cmake",
"clang_linker_script.ld",
"clang_linker_script.ld.src",
"clayer.schema.json",
"CMakeASM",
"CMSIS-Build-Utils.cmake",
Expand All @@ -32,9 +32,9 @@ def test_check_archive(base_path):
"cproject.schema.json",
"csolution.schema.json",
"GCC.10.3.1.cmake",
"gcc_linker_script.ld",
"gcc_linker_script.ld.src",
"IAR.9.32.1.cmake",
"iar_linker_script.icf",
"iar_linker_script.icf.src",
"PACK.xsd"}

assert(True == path.isfile(path.join(base_path,"LICENSE.txt")))
Expand Down

0 comments on commit ee72d68

Please sign in to comment.