Skip to content

Commit

Permalink
[buildmgr] Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
grasci-arm authored Jul 19, 2024
1 parent 57adc46 commit 571129e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
10 changes: 5 additions & 5 deletions tools/buildmgr/cbuildgen/installer/create_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 &&\
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 5 additions & 6 deletions tools/buildmgr/cbuildgen/installer/make_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,33 +95,33 @@ 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 &&\
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.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
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

Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions tools/buildmgr/docs/doxygen/Build/src/General.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ Software layers and Virtual I/O simplify these use cases:
<th>Description</th>
</tr>
<tr>
<td>2.5.0</td>
<td>Release notes:
- added alpha quality support for ARMv7R and ARMv8A for CLANG and AC6
- enforce toolchains registration via environment variables
- updated IAR mapping handling for 'Secure' mode
- updated cbuild2cmake utility v0.9.2
- updated cbuild utility v2.5.0
- updated cpackget utility v2.1.3
- updated csolution utility v2.5.0
- updated cbridge utility v0.9.9
</td>
<td>2.4.0</td>
<td>Release notes:
- added support for Cortex-M52 (CLANG)
Expand Down

0 comments on commit 571129e

Please sign in to comment.