diff --git a/tools/buildmgr/cbuildgen/installer/create_installer.sh b/tools/buildmgr/cbuildgen/installer/create_installer.sh index 484c004cc..f40552a15 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="0.8.2" +cpackget_version="0.8.5" 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}_linux_arm64.tar.gz -o - | tar xzfO - --wildc #curl --retry 3 -L ${cpackget_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${distdir}/bin/cpackget.mac-arm64 # Get cbuild -cbuild_version="1.2.0" +cbuild_version="1.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 88e4917ef..b52fd28bb 100755 --- a/tools/buildmgr/cbuildgen/installer/make_deb.sh +++ b/tools/buildmgr/cbuildgen/installer/make_deb.sh @@ -95,12 +95,12 @@ mkdir -p etc/${PACKAGE_NAME} mkdir -p etc/profile.d # Get cpackget -cpackget_version="0.8.2" +cpackget_version="0.8.5" 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 cbuild -cbuild_version="1.2.0" +cbuild_version="1.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 4a1717765..8761834fa 100644 --- a/tools/buildmgr/docs/doxygen/Build/src/General.txt +++ b/tools/buildmgr/docs/doxygen/Build/src/General.txt @@ -57,6 +57,16 @@ Software layers and Virtual I/O simplify these use cases: Description + 1.3.0 + Release for review of initial development: + - updated cbuild utility v1.3.0 + - updated cpackget utility v0.8.5 + - added compiler abstractions mappings + - added 'ldcflag' and 'ldcxxflag' handling + - added support for branch protection + - added support for 'linux-arm64' host platform​ + - added support for toolchain environment variables + 1.2.0 Release for review of initial development: - updated cbuild utility v1.2.0. diff --git a/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp b/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp index 6008afb18..3795748d7 100644 --- a/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp +++ b/tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp @@ -136,7 +136,7 @@ TEST_F(CPackGetTests, PackAddPackInstallationTest) { // Install pack with missing build environment TEST_F(CPackGetTests, PackAddNoEnvValidArgTest) { - TestParam param = { "", "pack.cpinstall", "", "", false }; + TestParam param = { "", "pack.cpinstall", "", "", true }; RunPackAdd(param, false); } @@ -201,7 +201,7 @@ TEST_F(CPackGetTests, InitValidInstallTest) { // Validate pack environment setup without // build environment and without argument passed TEST_F(CPackGetTests, InitNoEnvNoArgTest) { - TestParam param = { "", "", "", "", false }; + TestParam param = { "", "", "", "", true }; RunInit(param, false); }