Toolbox update versions (#129)

Co-authored-by: Joachim Krech <[email protected]>

.github/workflows/e2e_test.yaml

@@ -6,6 +6,7 @@ on:
  - '.github/workflows/robot-tests.yml'
  - 'test/**'
  - '!test/RobotTests.md'
+ - '!test/tests.py'
  workflow_dispatch:
 
 concurrency:

.github/workflows/toolbox.yml

@@ -40,7 +40,7 @@ jobs:
  uses: dsaltares/fetch-gh-release-asset@master
  with:
  repo: "Open-CMSIS-Pack/devtools"
- version: tags/tools/buildmgr/2.3.0
+ version: tags/tools/buildmgr/2.4.0
  file: cbuild_install.sh
  target: toolbox/cbuild/cbuild_install.sh
  token: ${{ secrets.GITHUB_TOKEN }}
@@ -67,7 +67,7 @@ jobs:
 
  - name: Unzip and copy files
  run: |
- curl https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/v1.7.33/schema/PACK.xsd --output distribution/etc/PACK.xsd
+ curl https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/v1.7.37/schema/PACK.xsd --output distribution/etc/PACK.xsd
  sudo chmod +x ./cbuild/cbuild_install.sh
  ./cbuild/cbuild_install.sh -x cbuild
  cp -r cbuild/bin/* distribution/bin
@@ -101,6 +101,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.bat-amd64 zip/cmsis-toolbox-windows-amd64/bin/launch-MCUXpressoConfigTools.bat
  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
@@ -109,6 +110,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.bat-arm64 zip/cmsis-toolbox-windows-arm64/bin/launch-MCUXpressoConfigTools.bat
  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
@@ -117,6 +119,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/launch-MCUXpressoConfigTools
  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
@@ -125,6 +128,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.lin-arm64 zip/cmsis-toolbox-linux-arm64/bin/launch-MCUXpressoConfigTools
  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
@@ -133,6 +137,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.mac-amd64 zip/cmsis-toolbox-darwin-amd64/bin/launch-MCUXpressoConfigTools
  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
@@ -141,6 +146,7 @@ jobs:
  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/launch-MCUXpressoConfigTools.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/launch-MCUXpressoConfigTools
  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

docs/progress.md

@@ -42,7 +42,6 @@ separation of config files belonging to layers
 generation of cbuild-idx.yml and cbuild.yml files | :heavy_check_mark: | csolution 1.2.0
 support for linux-arm64 host platform | :heavy_check_mark: | csolution 1.3.0
 support for win-arm64 and mac-arm64 host platforms | :heavy_check_mark: | csolution 1.7.0
-distribution of layers | :heavy_multiplication_x: | in progress
 disable update of RTE folder by default in cbuild | :heavy_check_mark: | cbuild 1.4.0
 `--update-rte` flag to enable the update of RTE folder contents in cbuild | :heavy_check_mark: | cbuild 1.4.0
 `--no-update-rte` flag to skip the update of RTE folder contents in csolution | :heavy_check_mark: | csolution 1.4.0
@@ -88,7 +87,7 @@ add `*.src` file extension as linker script source for pre-processing
 support multiple component instances | :heavy_check_mark: | csolution 2.3.0-dev0
 add cbuild `setup` command | :heavy_check_mark: | cbuild 2.3.0-dev0
 add alpha build manager backend | :heavy_check_mark: | cbuild2cmake 0.9.0-dev0
+`executes` nodes in csolution | :heavy_check_mark: | csolution 2.4.0
+`executes` nodes in cbuild2cmake | :heavy_check_mark: | cbuild2cmake 0.9.1
+extended cbuild `setup` with layers discovery | :heavy_check_mark: | cbuild 2.4.0
 resources management | :x: |
-execution groups/phases | :x: |
-pre/post build steps in csolution | :x: |
-pre/post build steps in cbuild | :x: |

scripts/set-default.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # -------------------------------------------------------
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 # -------------------------------------------------------
@@ -18,7 +18,7 @@ case $1 in
 esac
 
 # update toolchain config files
-script="$2/AC6.6.18.0.cmake"
+script="$2/AC6.6.16.2.cmake"
 sed -e "s|^ set(EXT.*| set(EXT ${extension})|" "${script}" > temp.$$ && mv temp.$$ "${script}"
 
 script="$2/GCC.10.3.1.cmake"

test/tests.py

@@ -1,23 +1,24 @@
 # -------------------------------------------------------
-# Copyright (c) 2023 Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 # -------------------------------------------------------
 
 from os import path
 import platform
+import glob
 
 def test_check_archive(base_path):
  """
  Test to check the archive content
  """
  dirDict = dict()
- dirDict["bin"] = {'cbuild', 'cbuildgen', 'cpackget', 'csolution', 'packchk', 'svdconv'}
+ dirDict["bin"] = {'cbuild', 'cbuildgen', 'cpackget', 'csolution', 'packchk', 'svdconv', 'launch-MCUXpressoConfigTools'}
  dirDict["doc"] = {'index.html'}
  dirDict["etc"] = {
  "{{ProjectName}}.cproject.yml",
  "{{SolutionName}}.csolution.yml",
- "AC6.6.18.0.cmake",
+ "AC6.6.16.2.cmake",
  "ac6_linker_script.sct.src",
  "cbuild.schema.json",
  "cdefault.schema.json",
@@ -40,6 +41,4 @@ def test_check_archive(base_path):
  assert(True == path.isfile(path.join(base_path,"LICENSE.txt")))
  for dir in dirDict:
  for file in dirDict[dir]:
- if dir == "bin" and platform.system() == "Windows":
- file += ".exe"
- assert(True == path.exists(path.join(base_path, dir, file)))
+ assert(glob.glob(path.join(base_path, dir, file + "*")))