From d8c1007898e43207f6c27ef7560fb08480ca554c Mon Sep 17 00:00:00 2001 From: grasci <86058054+grasci-arm@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:54:50 +0100 Subject: [PATCH] [buildmgr] Update versions --- .github/workflows/buildmgr.yml | 2 +- tools/buildmgr/cbuildgen/installer/create_installer.sh | 10 +++++----- tools/buildmgr/cbuildgen/installer/make_deb.sh | 10 +++++----- tools/buildmgr/docs/doxygen/Build/src/General.txt | 9 +++++++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml index 671896cd9..8205e4d40 100644 --- a/.github/workflows/buildmgr.yml +++ b/.github/workflows/buildmgr.yml @@ -103,7 +103,7 @@ jobs: run: | sudo apt-get update sudo apt-get install ninja-build python3 - wget -q http://launchpadlibrarian.net/163827726/doxygen_1.8.6-2_amd64.deb + wget -q http://security.ubuntu.com/ubuntu/pool/main//d/doxygen/doxygen_1.8.6-2_amd64.deb sudo dpkg -i doxygen_1.8.6-2_amd64.deb sudo pip install LinkChecker diff --git a/tools/buildmgr/cbuildgen/installer/create_installer.sh b/tools/buildmgr/cbuildgen/installer/create_installer.sh index 627909192..74dcb45b4 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.0" +cpackget_version="2.1.1" 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-dev0" +cbuild2cmake_version="0.9.0" 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.3" +cbridge_version="0.9.4" 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 @@ -91,7 +91,7 @@ curl --retry 3 -L ${cbridge_base}_windows_arm64.zip -o temp.zip && unzip -p te curl --retry 3 -L ${cbridge_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards '*cbridge' > ${distdir}/bin/cbridge.mac-arm64 # Get csolution -csolution_version="2.3.0-dev0" +csolution_version="2.3.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 +104,7 @@ cp -r temp/etc/* ${distdir}/etc rm temp.zip && rm -rf temp # Get cbuild -cbuild_version="2.3.0-dev0" +cbuild_version="2.3.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 de11e9c79..d2b955f09 100755 --- a/tools/buildmgr/cbuildgen/installer/make_deb.sh +++ b/tools/buildmgr/cbuildgen/installer/make_deb.sh @@ -95,22 +95,22 @@ mkdir -p etc/${PACKAGE_NAME} mkdir -p etc/profile.d # Get cpackget -cpackget_version="2.0.0" +cpackget_version="2.1.1" 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-dev0" +cbuild2cmake_version="0.9.0" 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.3" +cbridge_version="0.9.4" 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 # Get csolution -csolution_version="2.3.0-dev0" +csolution_version="2.3.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 @@ -118,7 +118,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.3.0-dev0" +cbuild_version="2.3.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 e681806dd..ca9a28bfa 100644 --- a/tools/buildmgr/docs/doxygen/Build/src/General.txt +++ b/tools/buildmgr/docs/doxygen/Build/src/General.txt @@ -57,6 +57,15 @@ Software layers and Virtual I/O simplify these use cases: Description + 2.3.0 + Release notes: + - added support for Cortex-M52 (only AC6) + - updated cbuild2cmake utility v0.9.0 (alpha support) + - updated cbuild utility v2.3.0 + - updated cpackget utility v2.1.1 + - updated csolution utility v2.3.0 + - updated cbridge utility v0.9.4 + 2.3.0-dev0 Release candidate: - added cbuild2cmake utility v0.9.0-dev0 (alpha support)