From f13adb7886552cf5af01d47f4333fdca11b9cab6 Mon Sep 17 00:00:00 2001
From: grasci <86058054+grasci-arm@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:00:46 +0100
Subject: [PATCH] [buildmgr] Update versions

---
 tools/buildmgr/cbuildgen/installer/create_installer.sh | 10 +++++-----
 tools/buildmgr/cbuildgen/installer/make_deb.sh         | 10 +++++-----
 tools/buildmgr/docs/doxygen/Build/src/General.txt      | 10 ++++++++++
 .../buildmgr/test/integrationtests/src/DebPkgTests.cpp | 10 ++++++++--
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/tools/buildmgr/cbuildgen/installer/create_installer.sh b/tools/buildmgr/cbuildgen/installer/create_installer.sh
index 3447fb65b..31468500d 100755
--- a/tools/buildmgr/cbuildgen/installer/create_installer.sh
+++ b/tools/buildmgr/cbuildgen/installer/create_installer.sh
@@ -61,7 +61,7 @@ cp -R ../config/. ${distdir}/etc
 cp ../../docs/LICENSE.txt ${distdir}
 
 # Get cpackget
-cpackget_version="2.1.3"
+cpackget_version="2.1.4"
 cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
 curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards    '*cpackget'     > ${distdir}/bin/cpackget.lin-amd64
 curl --retry 3 -L ${cpackget_base}_windows_amd64.zip   -o temp.zip && unzip -p temp.zip '*/cpackget.exe' > ${distdir}/bin/cpackget.exe-amd64 && rm temp.zip
@@ -71,7 +71,7 @@ curl --retry 3 -L ${cpackget_base}_windows_arm64.zip   -o temp.zip && unzip -p t
 curl --retry 3 -L ${cpackget_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards    '*cpackget'     > ${distdir}/bin/cpackget.mac-arm64
 
 # Get cbuild2cmake
-cbuild2cmake_version="0.9.2"
+cbuild2cmake_version="0.9.3"
 cbuild2cmake_base=https://github.com/Open-CMSIS-Pack/cbuild2cmake/releases/download/v${cbuild2cmake_version}/cbuild2cmake_${cbuild2cmake_version}
 curl --retry 3 -L ${cbuild2cmake_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards    '*cbuild2cmake'     > ${distdir}/bin/cbuild2cmake.lin-amd64
 curl --retry 3 -L ${cbuild2cmake_base}_windows_amd64.zip   -o temp.zip && unzip -p temp.zip '*/cbuild2cmake.exe' > ${distdir}/bin/cbuild2cmake.exe-amd64 && rm temp.zip
@@ -81,7 +81,7 @@ curl --retry 3 -L ${cbuild2cmake_base}_windows_arm64.zip   -o temp.zip && unzip
 curl --retry 3 -L ${cbuild2cmake_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards    '*cbuild2cmake'     > ${distdir}/bin/cbuild2cmake.mac-arm64
 
 # Get cbridge
-cbridge_version="0.9.9"
+cbridge_version="0.9.11"
 cbridge_base=https://github.com/Open-CMSIS-Pack/generator-bridge/releases/download/v${cbridge_version}/cbridge_${cbridge_version}
 curl --retry 3 -L ${cbridge_base}_linux_amd64.tar.gz -o - | tar xzf - &&\
   cp cbridge_${cbridge_version}_linux_amd64/cbridge ${distdir}/bin/cbridge.lin-amd64 &&\
@@ -109,7 +109,7 @@ curl --retry 3 -L ${cbridge_base}_darwin_arm64.tar.gz -o - | tar xzf - &&\
   rm -r cbridge_${cbridge_version}_darwin_arm64
 
 # Get csolution
-csolution_version="2.5.0"
+csolution_version="2.6.0"
 csolution_base=https://github.com/Open-CMSIS-Pack/devtools/releases/download/tools%2Fprojmgr%2F${csolution_version}/projmgr.zip
 curl --retry 3 -L ${csolution_base} -o temp.zip && unzip -q -d temp temp.zip
 cp 'temp/bin/linux-amd64/csolution' ${distdir}/bin/csolution.lin-amd64
@@ -122,7 +122,7 @@ cp -r temp/etc/* ${distdir}/etc
 rm temp.zip && rm -rf temp
 
 # Get cbuild
-cbuild_version="2.5.0"
+cbuild_version="2.6.0"
 cbuild_base=https://github.com/Open-CMSIS-Pack/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
 curl --retry 3 -L ${cbuild_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards    '*cbuild'     > ${distdir}/bin/cbuild.lin-amd64
 curl --retry 3 -L ${cbuild_base}_windows_amd64.zip   -o temp.zip && unzip -p temp.zip '*/cbuild.exe' > ${distdir}/bin/cbuild.exe-amd64 && rm temp.zip
diff --git a/tools/buildmgr/cbuildgen/installer/make_deb.sh b/tools/buildmgr/cbuildgen/installer/make_deb.sh
index 764230e2f..dd1ccab59 100755
--- a/tools/buildmgr/cbuildgen/installer/make_deb.sh
+++ b/tools/buildmgr/cbuildgen/installer/make_deb.sh
@@ -95,17 +95,17 @@ mkdir -p etc/${PACKAGE_NAME}
 mkdir -p etc/profile.d
 
 # Get cpackget
-cpackget_version="2.1.3"
+cpackget_version="2.1.4"
 cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
 curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${input}/bin/cpackget.lin-amd64
 
 # Get cbuild2cmake
-cbuild2cmake_version="0.9.2"
+cbuild2cmake_version="0.9.3"
 cbuild2cmake_base=https://github.com/Open-CMSIS-Pack/cbuild2cmake/releases/download/v${cbuild2cmake_version}/cbuild2cmake_${cbuild2cmake_version}
 curl --retry 3 -L ${cbuild2cmake_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards '*cbuild2cmake' > ${distdir}/bin/cbuild2cmake.lin-amd64
 
 # Get generator-bridge
-cbridge_version="0.9.9"
+cbridge_version="0.9.11"
 cbridge_base=https://github.com/Open-CMSIS-Pack/generator-bridge/releases/download/v${cbridge_version}/cbridge_${cbridge_version}
 curl --retry 3 -L ${cbridge_base}_linux_amd64.tar.gz -o - | tar xzf - &&\
   cp cbridge_${cbridge_version}_linux_amd64/cbridge ${distdir}/bin/cbridge.lin-amd64 &&\
@@ -113,7 +113,7 @@ curl --retry 3 -L ${cbridge_base}_linux_amd64.tar.gz -o - | tar xzf - &&\
   rm -r cbridge_${cbridge_version}_linux_amd64
 
 # Get csolution
-csolution_version="2.5.0"
+csolution_version="2.6.0"
 csolution_base=https://github.com/Open-CMSIS-Pack/devtools/releases/download/tools%2Fprojmgr%2F${csolution_version}/projmgr.zip
 curl --retry 3 -L ${csolution_base} -o temp.zip && unzip -q -d temp temp.zip
 cp 'temp/bin/linux-amd64/csolution' ${input}/bin/csolution.lin-amd64
@@ -121,7 +121,7 @@ cp -r temp/etc/* etc/${PACKAGE_NAME}
 cp -r temp/etc/* usr/lib/${PACKAGE_NAME} && rm temp.zip && rm -rf temp
 
 # Get cbuild
-cbuild_version="2.5.0"
+cbuild_version="2.6.0"
 cbuild_base=https://github.com/Open-CMSIS-Pack/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
 curl --retry 3 -L ${cbuild_base}_linux_amd64.tar.gz  -o - | tar xzfO - --wildcards '*cbuild' > ${input}/bin/cbuild.lin-amd64
 
diff --git a/tools/buildmgr/docs/doxygen/Build/src/General.txt b/tools/buildmgr/docs/doxygen/Build/src/General.txt
index bf3c9509c..223bc08fe 100644
--- a/tools/buildmgr/docs/doxygen/Build/src/General.txt
+++ b/tools/buildmgr/docs/doxygen/Build/src/General.txt
@@ -57,6 +57,16 @@ Software layers and Virtual I/O simplify these use cases:
     <th>Description</th>
   </tr>
   <tr>
+    <td>2.6.0</td>
+    <td>Release notes:
+      - added support for trustzone mode 'secure-only'
+      - extended 'language-C' accepted values: c17 and c23
+      - updated cbuild2cmake utility v0.9.3
+      - updated cbuild utility v2.6.0
+      - updated cpackget utility v2.1.4
+      - updated csolution utility v2.6.0
+      - updated cbridge utility v0.9.11
+    </td>
     <td>2.5.0</td>
     <td>Release notes:
       - added alpha quality support for ARMv7R and ARMv8A for CLANG and AC6
diff --git a/tools/buildmgr/test/integrationtests/src/DebPkgTests.cpp b/tools/buildmgr/test/integrationtests/src/DebPkgTests.cpp
index 9ed559cd0..a74558e1d 100644
--- a/tools/buildmgr/test/integrationtests/src/DebPkgTests.cpp
+++ b/tools/buildmgr/test/integrationtests/src/DebPkgTests.cpp
@@ -51,10 +51,13 @@ void DebPkgTests::ValidateExtract(const string& extPath) {
     "./etc/cmsis-build/AC6.6.16.2.cmake",
     "./etc/cmsis-build/CPRJ.xsd", "./etc/cmsis-build/GCC.10.3.1.cmake",
     "./etc/cmsis-build/setup",
-    "./etc/cmsis-build/{{ProjectName}}.cproject.yml", "./etc/cmsis-build/{{SolutionName}}.csolution.yml",
     "./etc/cmsis-build/cdefault.schema.json", "./etc/cmsis-build/clayer.schema.json",
     "./etc/cmsis-build/common.schema.json", "./etc/cmsis-build/cproject.schema.json",
     "./etc/cmsis-build/csolution.schema.json",
+    "./etc/cmsis-build/cbuild-gen.schema.json", "./etc/cmsis-build/cbuild-gen-idx.schema.json",
+    "./etc/cmsis-build/cbuild-pack.schema.json", "./etc/cmsis-build/cbuild-set.schema.json",
+    "./etc/cmsis-build/generator.schema.json", "./etc/cmsis-build/cgen.schema.json",
+    "./etc/cmsis-build/global.generator.yml",
     "./etc/profile.d/cmsis-build.sh", "./usr/bin/cbuild.sh",
     "./usr/bin/cpackget",
     "./usr/bin/cbuildgen",
@@ -67,10 +70,13 @@ void DebPkgTests::ValidateExtract(const string& extPath) {
     "./usr/lib/cmsis-build/etc/AC6.6.16.2.cmake",
     "./usr/lib/cmsis-build/etc/CPRJ.xsd", "./usr/lib/cmsis-build/etc/GCC.10.3.1.cmake",
     "./usr/lib/cmsis-build/etc/setup",
-    "./usr/lib/cmsis-build/{{ProjectName}}.cproject.yml", "./usr/lib/cmsis-build/{{SolutionName}}.csolution.yml",
     "./usr/lib/cmsis-build/cdefault.schema.json", "./usr/lib/cmsis-build/clayer.schema.json",
     "./usr/lib/cmsis-build/common.schema.json", "./usr/lib/cmsis-build/cproject.schema.json",
     "./usr/lib/cmsis-build/csolution.schema.json",
+    "./usr/lib/cmsis-build/cbuild-gen.schema.json", "./usr/lib/cmsis-build/cbuild-gen-idx.schema.json",
+    "./usr/lib/cmsis-build/cbuild-pack.schema.json", "./usr/lib/cmsis-build/cbuild-set.schema.json",
+    "./usr/lib/cmsis-build/generator.schema.json", "./usr/lib/cmsis-build/cgen.schema.json",
+    "./usr/lib/cmsis-build/global.generator.yml",
     "./usr/share/doc/cmsis-build/copyright",
     "./usr/share/doc/cmsis-build/doc/index.html"
   };