Skip to content

Commit

Permalink
[buildmgr] Update versions and installer dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
brondani committed Feb 23, 2023
1 parent 106be8f commit 7fd8d90
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 8 deletions.
17 changes: 15 additions & 2 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="0.9.0"
cpackget_version="0.9.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
Expand All @@ -70,8 +70,21 @@ curl --retry 3 -L ${cpackget_base}_linux_arm64.tar.gz -o - | tar xzfO - --wildc
#curl --retry 3 -L ${cpackget_base}_windows_arm64.zip -o temp.zip && unzip -p temp.zip '*/cpackget.exe' > ${distdir}/bin/cpackget.exe-arm64 && rm temp.zip
#curl --retry 3 -L ${cpackget_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${distdir}/bin/cpackget.mac-arm64

# Get csolution
csolution_version="1.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
cp 'temp/bin/windows-amd64/csolution.exe' ${distdir}/bin/csolution.exe-amd64
cp 'temp/bin/darwin-amd64/csolution' ${distdir}/bin/csolution.mac-amd64
cp 'temp/bin/linux-arm64/csolution' ${distdir}/bin/csolution.lin-arm64
#cp 'temp/bin/windows-arm64/csolution.exe' ${distdir}/bin/csolution.exe-arm64
#cp 'temp/bin/darwin-arm64/csolution' ${distdir}/bin/csolution.mac-arm64
cp -r temp/etc/* ${distdir}/etc
rm temp.zip && rm -rf temp

# Get cbuild
cbuild_version="1.4.0"
cbuild_version="1.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
6 changes: 3 additions & 3 deletions tools/buildmgr/cbuildgen/installer/make_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,20 @@ mkdir -p etc/${PACKAGE_NAME}
mkdir -p etc/profile.d

# Get cpackget
cpackget_version="0.9.0"
cpackget_version="0.9.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 csolution
csolution_version="1.4.0"
csolution_version="1.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="1.4.0"
cbuild_version="1.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 Down
12 changes: 12 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,18 @@ Software layers and Virtual I/O simplify these use cases:
<th>Description</th>
</tr>
<tr>
<td>1.5.0</td>
<td>Release for review of initial development:
- updated cbuild utility v1.5.0
- updated cpackget utility v0.9.2
- added Star-MC1 flags for Arm Compiler
- added Star-MC1, Cortex-M55 and Cortex-M85 for IAR Compiler
- added 'output' filenames customization handling
- added 'gendir' component instance attribute
- rework toolchain registration
- fixex: include paths order
- fixed: file specific defines
</td>
<td>1.4.0</td>
<td>Release for review of initial development:
- updated cbuild utility v1.4.0
Expand Down
8 changes: 5 additions & 3 deletions tools/buildmgr/test/integrationtests/src/InstallerTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ void InstallerTests::RunInstallerScript(const string& arg) {
void InstallerTests::CheckInstallationDir(const string& path, bool expect) {
vector<pair<string, vector<string>>> dirVec = {
#ifdef _WIN32
{ "bin", vector<string>{ "cbuild.sh", "cbuildgen.exe", "cpackget.exe"} },
{ "bin", vector<string>{ "cbuild.sh", "cbuildgen.exe", "cpackget.exe", "csolution.exe"} },
#else
{ "bin", vector<string>{ "cbuild.sh", "cbuildgen", "cpackget"} },
{ "bin", vector<string>{ "cbuild.sh", "cbuildgen", "cpackget", "csolution"} },
#endif
{ "doc", vector<string>{ "index.html", "html"} },
{ "etc", vector<string>{ "AC5.5.6.7.cmake", "AC6.6.18.0.cmake", "CPRJ.xsd",
Expand Down Expand Up @@ -72,9 +72,11 @@ void InstallerTests::CheckExtractedDir(const string& path, bool expect) {
"cbuild.lin-amd64", "cbuild.exe-amd64",
"cpackget.lin-amd64", "cpackget.exe-amd64",
"cbuildgen.lin-amd64", "cbuildgen.exe-amd64",
"csolution.lin-amd64", "csolution.exe-amd64",
"cbuild.lin-arm64",
"cpackget.lin-arm64",
"cbuildgen.lin-arm64"} },
"cbuildgen.lin-arm64",
"csolution.lin-arm64"} },
{ "doc", vector<string>{ "index.html", "html"} },
{ "etc", vector<string>{"AC5.5.6.7.cmake", "AC6.6.18.0.cmake", "CPRJ.xsd",
"GCC.10.3.1.cmake", "IAR.9.32.1.cmake", "setup"} }
Expand Down

0 comments on commit 7fd8d90

Please sign in to comment.