[projmgr] Emit api nodes in a deterministic order

Open-CMSIS-Pack · Dec 16, 2024 · b583731 · b583731
1 parent d02ebf4
commit b583731
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tools/projmgr/include/ProjMgrWorker.h b/tools/projmgr/include/ProjMgrWorker.h
@@ -330,7 +330,7 @@ struct ContextItem {
   std::map<std::string, std::string> targetAttributes;
   std::map<std::string, RtePackage*> packages;
   std::map<std::string, SelectedComponentItem> components;
-  std::map<RteApi*, std::vector<std::string>> apis;
+  std::map<std::string, std::pair<RteApi*, std::vector<std::string>>> apis;
   std::map<std::string, SelectedComponentItem> bootstrapComponents;
   StrMap bootstrapMap;
   std::vector<std::tuple<RteItem::ConditionResult, std::string, std::set<std::string>, std::set<std::string>>> validationResults;

diff --git a/tools/projmgr/src/ProjMgrCbuild.cpp b/tools/projmgr/src/ProjMgrCbuild.cpp
@@ -203,9 +203,10 @@ void ProjMgrCbuild::SetComponentFilesNode(YAML::Node node, const ContextItem* co
 }
 
 void ProjMgrCbuild::SetApisNode(YAML::Node node, const ContextItem* context) {
-  for (const auto& [api, componentIds] : context->apis) {
+  for (const auto& [apiId, item] : context->apis) {
     YAML::Node apiNode;
-    const auto& apiId = api->ConstructComponentID(true);
+    const auto& api = item.first;
+    const auto& componentIds = item.second;
     SetNodeValue(apiNode[YAML_API], apiId);
     SetNodeValue(apiNode[YAML_CONDITION], api->GetConditionID());
     SetNodeValue(apiNode[YAML_FROM_PACK], api->GetPackageID());

diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -2217,9 +2217,10 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) {
     // component based API files
     const auto& api = rteComponent->GetApi(context.rteActiveTarget, true);
     if (api) {
-      context.apis[api].push_back(componentId);
-      if (context.apis[api].size() == 1) {
-        const auto& apiId = api->ConstructComponentID(true);
+      const auto& apiId = api->ConstructComponentID(true);
+      context.apis[apiId].first = api;
+      context.apis[apiId].second.push_back(componentId);
+      if (context.apis[apiId].second.size() == 1) {
         const auto& apiFiles = api->GetFileContainer() ? api->GetFileContainer()->GetChildren() : Collection<RteItem*>();
         for (const auto& apiFile : apiFiles) {
           const auto& attr = apiFile->GetAttribute("attr");