[buildmgr] Update versions

Open-CMSIS-Pack · May 16, 2024 · 193d344 · 193d344
1 parent 1f8b20f
commit 193d344
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 17 deletions.
diff --git 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.1"
+cpackget_version="2.1.2"
 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.0"
+cbuild2cmake_version="0.9.1"
 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,17 +81,35 @@ 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.4"
+cbridge_version="0.9.5"
 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 xzfO - --wildcards    '*cbridge'     > ${distdir}/bin/cbridge.lin-amd64
-curl --retry 3 -L ${cbridge_base}_windows_amd64.zip   -o temp.zip && unzip -p temp.zip '*/cbridge.exe' > ${distdir}/bin/cbridge.exe-amd64 && rm temp.zip
-curl --retry 3 -L ${cbridge_base}_darwin_amd64.tar.gz -o - | tar xzfO - --wildcards    '*cbridge'     > ${distdir}/bin/cbridge.mac-amd64
-curl --retry 3 -L ${cbridge_base}_linux_arm64.tar.gz  -o - | tar xzfO - --wildcards    '*cbridge'     > ${distdir}/bin/cbridge.lin-arm64
-curl --retry 3 -L ${cbridge_base}_windows_arm64.zip   -o temp.zip && unzip -p temp.zip '*/cbridge.exe' > ${distdir}/bin/cbridge.exe-arm64 && rm temp.zip
-curl --retry 3 -L ${cbridge_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards    '*cbridge'     > ${distdir}/bin/cbridge.mac-arm64
+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 &&\
+  cp cbridge_${cbridge_version}_linux_amd64/launch-MCUXpressoConfigTools ${distdir}/bin/launch-MCUXpressoConfigTools.lin-amd64 &&\
+  rm -r cbridge_${cbridge_version}_linux_amd64
+curl --retry 3 -L ${cbridge_base}_windows_amd64.zip -o temp.zip &&\
+  unzip -p temp.zip '*/cbridge.exe' > ${distdir}/bin/cbridge.exe-amd64 &&\
+  unzip -p temp.zip '*/launch-MCUXpressoConfigTools.bat' > ${distdir}/bin/launch-MCUXpressoConfigTools.bat-amd64 &&\
+  rm temp.zip
+curl --retry 3 -L ${cbridge_base}_darwin_amd64.tar.gz -o - | tar xzf - &&\
+  cp cbridge_${cbridge_version}_darwin_amd64/cbridge ${distdir}/bin/cbridge.mac-amd64 &&\
+  cp cbridge_${cbridge_version}_darwin_amd64/launch-MCUXpressoConfigTools ${distdir}/bin/launch-MCUXpressoConfigTools.mac-amd64 &&\
+  rm -r cbridge_${cbridge_version}_darwin_amd64  
+curl --retry 3 -L ${cbridge_base}_linux_arm64.tar.gz -o - | tar xzf - &&\
+  cp cbridge_${cbridge_version}_linux_arm64/cbridge ${distdir}/bin/cbridge.lin-arm64 &&\
+  cp cbridge_${cbridge_version}_linux_arm64/launch-MCUXpressoConfigTools ${distdir}/bin/launch-MCUXpressoConfigTools.lin-arm64 &&\
+  rm -r cbridge_${cbridge_version}_linux_arm64
+curl --retry 3 -L ${cbridge_base}_windows_arm64.zip -o temp.zip &&\
+  unzip -p temp.zip '*/cbridge.exe' > ${distdir}/bin/cbridge.exe-arm64 &&\
+  unzip -p temp.zip '*/launch-MCUXpressoConfigTools.bat' > ${distdir}/bin/launch-MCUXpressoConfigTools.bat-arm64 &&\
+  rm temp.zip
+curl --retry 3 -L ${cbridge_base}_darwin_arm64.tar.gz -o - | tar xzf - &&\
+  cp cbridge_${cbridge_version}_darwin_arm64/cbridge ${distdir}/bin/cbridge.mac-arm64 &&\
+  cp cbridge_${cbridge_version}_darwin_arm64/launch-MCUXpressoConfigTools ${distdir}/bin/launch-MCUXpressoConfigTools.mac-arm64 &&\
+  rm -r cbridge_${cbridge_version}_darwin_arm64
 
 # Get csolution
-csolution_version="2.3.0"
+csolution_version="2.4.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
@@ -104,7 +122,7 @@ cp -r temp/etc/* ${distdir}/etc
 rm temp.zip && rm -rf temp
 
 # Get cbuild
-cbuild_version="2.3.0"
+cbuild_version="2.4.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
@@ -95,30 +95,33 @@ mkdir -p etc/${PACKAGE_NAME}
 mkdir -p etc/profile.d
 
 # Get cpackget
-cpackget_version="2.1.1"
+cpackget_version="2.1.2"
 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.0"
+cbuild2cmake_version="0.9.1"
 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.4"
+cbridge_version="0.9.5"
 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 xzfO - --wildcards '*cpackget' > ${input}/bin/cbridge.lin-amd64
+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 &&\
+  cp cbridge_${cbridge_version}_linux_amd64/launch-MCUXpressoConfigTools ${distdir}/bin/launch-MCUXpressoConfigTools.lin-amd64 &&\
+  rm -r cbridge_${cbridge_version}_linux_amd64
 
 # Get csolution
-csolution_version="2.3.0"
+csolution_version="2.4.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
 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.3.0"
+cbuild_version="2.4.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
@@ -57,6 +57,19 @@ Software layers and Virtual I/O simplify these use cases:
     <th>Description</th>
   </tr>
   <tr>
+    <td>2.4.0</td>
+    <td>Release notes:
+      - added support for Cortex-M52 (CLANG)
+      - updated cbuild2cmake utility v0.9.1 (alpha support)
+      - updated cbuild utility v2.4.0
+      - updated cpackget utility v2.1.2
+      - updated csolution utility v2.4.0
+      - updated cbridge utility v0.9.5
+      - updated and renamed AC6.6.18.0.cmake to AC6.6.16.2.cmake
+      - removed CMake info message concerning registered toolchain
+      - fixed undefines list calculation to only match key
+      - fixed missing CXX file option
+    </td>
     <td>2.3.0</td>
     <td>Release notes:
       - added support for Cortex-M52 (only AC6)