Complement AC5 support removal

Open-CMSIS-Pack · Jun 23, 2023 · 7f7c524 · 7f7c524
1 parent 8b2bd53
commit 7f7c524
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/tools/buildmgr/cbuild/src/CbuildProject.cpp b/tools/buildmgr/cbuild/src/CbuildProject.cpp
@@ -129,7 +129,7 @@ bool CbuildProject::UpdateTarget(const RteItem* components, const map<string, st
 }
 
 void CbuildProject::SetToolchain(const string& toolchain, map<string, string> &attributes) {
-  if ((toolchain.compare("AC5") == 0) || (toolchain.compare("AC6") == 0)) {
+  if (toolchain.compare("AC6") == 0) {
     attributes["Tcompiler"] = "ARMCC";
     attributes["Toptions"] = toolchain;
   } else {

diff --git a/tools/buildmgr/cbuildgen/config/CPRJ.xsd b/tools/buildmgr/cbuildgen/config/CPRJ.xsd
@@ -245,7 +245,6 @@
   <xs:simpleType name="CompilerEnumType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="GCC" />
-      <xs:enumeration value="AC5" />
       <xs:enumeration value="AC6" />
       <xs:enumeration value="IAR" />
       <xs:enumeration value="Tasking" />

diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -1206,7 +1206,7 @@ bool ProjMgrWorker::ProcessToolchain(ContextItem& context) {
       context.toolchain.version = RteUtils::GetPrefix(context.toolchain.range);
     }
   }
-  if (context.toolchain.name == "AC6" || context.toolchain.name == "AC5") {
+  if (context.toolchain.name == "AC6") {
     context.targetAttributes["Tcompiler"] = "ARMCC";
     context.targetAttributes["Toptions"] = context.toolchain.name;
   } else {

diff --git a/tools/projmgr/test/src/ProjMgrTestEnv.cpp b/tools/projmgr/test/src/ProjMgrTestEnv.cpp
@@ -104,7 +104,6 @@ void ProjMgrTestEnv::SetUp() {
 
   // create dummy cmsis compiler root
   RteFsUtils::CreateDirectories(testcmsiscompiler_folder);
-  RteFsUtils::CreateFile(testcmsiscompiler_folder + "/AC5.5.6.7.cmake", "");
   RteFsUtils::CreateFile(testcmsiscompiler_folder + "/AC6.6.18.0.cmake", "");
   RteFsUtils::CreateFile(testcmsiscompiler_folder + "/GCC.11.2.1.cmake", "");
   RteFsUtils::CreateFile(testcmsiscompiler_folder + "/IAR.8.50.6.cmake", "");