From 571129e030e6e3df054eea667af7976d2061b157 Mon Sep 17 00:00:00 2001 From: grasci <86058054+grasci-arm@users.noreply.github.com> Date: Fri, 19 Jul 2024 13:32:27 +0100 Subject: [PATCH] [buildmgr] Update versions --- .../buildmgr/cbuildgen/installer/create_installer.sh | 10 +++++----- tools/buildmgr/cbuildgen/installer/make_deb.sh | 11 +++++------ tools/buildmgr/docs/doxygen/Build/src/General.txt | 11 +++++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/tools/buildmgr/cbuildgen/installer/create_installer.sh b/tools/buildmgr/cbuildgen/installer/create_installer.sh index 0d2834264..3447fb65b 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.2" +cpackget_version="2.1.3" 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.1" +cbuild2cmake_version="0.9.2" 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.5" +cbridge_version="0.9.9" 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.4.0" +csolution_version="2.5.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.4.0" +cbuild_version="2.5.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 75400ca58..764230e2f 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.2" +cpackget_version="2.1.3" 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.1" +cbuild2cmake_version="0.9.2" 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.5" +cbridge_version="0.9.9" 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.4.0" +csolution_version="2.5.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.4.0" +cbuild_version="2.5.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 @@ -139,7 +139,6 @@ find . -type f -name "*.exe*" -exec rm {} ';' find . -type f -name "*.mac*" -exec rm {} ';' find . -type f -name "*.lin-arm64" -exec rm {} ';' find . -type f -name "*.lin-amd64" | sed -e 's/.lin-amd64//g' | xargs -I file mv file".lin-amd64" file -find . -type f -name "*.cmake" -exec sed -i "s|set(TOOLCHAIN_ROOT.*|set(TOOLCHAIN_ROOT /usr/bin)|" {} ';' find usr/lib/${PACKAGE_NAME}/bin -type f -not -name "*.sh" | xargs -I file basename file | xargs -I util ln -s /usr/lib/${PACKAGE_NAME}/bin/util usr/bin/util # For the bash scripts, create wrappers as suggested in documentation: # https://www.debian.org/doc/debian-policy/ch-opersys.html#environment-variables diff --git a/tools/buildmgr/docs/doxygen/Build/src/General.txt b/tools/buildmgr/docs/doxygen/Build/src/General.txt index fa2e68759..bf3c9509c 100644 --- a/tools/buildmgr/docs/doxygen/Build/src/General.txt +++ b/tools/buildmgr/docs/doxygen/Build/src/General.txt @@ -57,6 +57,17 @@ Software layers and Virtual I/O simplify these use cases: