[rtemodel, buildmgr] Update CPRJ target name handling

brondani · Feb 8, 2023 · fd05a6f · fd05a6f
1 parent 7fb0010
commit fd05a6f
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 10 deletions.
diff --git a/libs/rtemodel/src/RteCprjProject.cpp b/libs/rtemodel/src/RteCprjProject.cpp
@@ -109,7 +109,10 @@ void RteCprjProject::Initialize()
 {
   // create target based on cprj description
   CprjFile* cprjFile = GetCprjFile();
-  string targetName = GetName(); // use same name as project
+  const string& cprjName = GetName();
+  size_t lastDot = cprjName.find_last_of('.');
+  const string& targetName = (lastDot != string::npos) && ((lastDot+1) < cprjName.length()) ?
+    cprjName.substr(lastDot+1) : "Target 1";
 
   XmlItem filterAttributes;
   CprjTargetElement* cprjTarget = cprjFile->GetTargetElement();

diff --git a/libs/rtemodel/test/src/RteModelTest.cpp b/libs/rtemodel/test/src/RteModelTest.cpp
@@ -109,7 +109,7 @@ class RteModelPrjTest : public RteModelTestConfig {
   void GenerateHeadersTest(const string& project, const string& rteFolder) {
 
     const string projectDir = RteUtils::ExtractFilePath(project, true);
-    const string targetFolder = "/_" + RteUtils::ExtractFileBaseName(project) + "/";
+    const string targetFolder = "/_Target_1/";
     const string preIncComp = projectDir + rteFolder + targetFolder + "Pre_Include_RteTest_ComponentLevel.h";
     const string preIncGlob = projectDir + rteFolder + targetFolder + "Pre_Include_Global.h";
     const string rteComp = projectDir + rteFolder + targetFolder + "RTE_Components.h";

diff --git a/...eTestM3_ConfigFolder/Pre_Include_Global.h → ...FIG_FOLDER/_Target_1/Pre_Include_Global.h b/...eTestM3_ConfigFolder/Pre_Include_Global.h → ...FIG_FOLDER/_Target_1/Pre_Include_Global.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3_ConfigFolder' 
- * Target:  'RteTestM3_ConfigFolder' 
+ * Target:  'Target 1' 
  */
 
 #ifndef PRE_INCLUDE_GLOBAL_H

diff --git a/...lder/Pre_Include_RteTest_ComponentLevel.h → ...et_1/Pre_Include_RteTest_ComponentLevel.h b/...lder/Pre_Include_RteTest_ComponentLevel.h → ...et_1/Pre_Include_RteTest_ComponentLevel.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3_ConfigFolder' 
- * Target:  'RteTestM3_ConfigFolder' 
+ * Target:  'Target 1' 
  */
 
 #ifndef PRE_INCLUDE_RTETEST_COMPONENTLEVEL_H

diff --git a/.../_RteTestM3_ConfigFolder/RTE_Components.h → .../CONFIG_FOLDER/_Target_1/RTE_Components.h b/.../_RteTestM3_ConfigFolder/RTE_Components.h → .../CONFIG_FOLDER/_Target_1/RTE_Components.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3_ConfigFolder' 
- * Target:  'RteTestM3_ConfigFolder' 
+ * Target:  'Target 1' 
  */
 
 #ifndef RTE_COMPONENTS_H

diff --git a/...estM3/RTE/_RteTestM3/Pre_Include_Global.h → ...TestM3/RTE/_Target_1/Pre_Include_Global.h b/...estM3/RTE/_RteTestM3/Pre_Include_Global.h → ...TestM3/RTE/_Target_1/Pre_Include_Global.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3' 
- * Target:  'RteTestM3' 
+ * Target:  'Target 1' 
  */
 
 #ifndef PRE_INCLUDE_GLOBAL_H

diff --git a/...stM3/Pre_Include_RteTest_ComponentLevel.h → ...et_1/Pre_Include_RteTest_ComponentLevel.h b/...stM3/Pre_Include_RteTest_ComponentLevel.h → ...et_1/Pre_Include_RteTest_ComponentLevel.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3' 
- * Target:  'RteTestM3' 
+ * Target:  'Target 1' 
  */
 
 #ifndef PRE_INCLUDE_RTETEST_COMPONENTLEVEL_H

diff --git a/...RteTestM3/RTE/_RteTestM3/RTE_Components.h → .../RteTestM3/RTE/_Target_1/RTE_Components.h b/...RteTestM3/RTE/_RteTestM3/RTE_Components.h → .../RteTestM3/RTE/_Target_1/RTE_Components.h
@@ -4,7 +4,7 @@
  *      *** Do not modify ! ***
  *
  * Project: 'RteTestM3' 
- * Target:  'RteTestM3' 
+ * Target:  'Target 1' 
  */
 
 #ifndef RTE_COMPONENTS_H

diff --git a/tools/buildmgr/cbuild/src/CbuildModel.cpp b/tools/buildmgr/cbuild/src/CbuildModel.cpp
@@ -86,7 +86,7 @@ bool CbuildModel::Create(const CbuildRteArgs& args) {
         fs::create_directories(intdir, ec);
       }
       // generate cpinstall file
-      string filename = intdir + (intdir.back() == '/' ? "" : "/") + m_targetName + ".cpinstall";
+      string filename = intdir + (intdir.back() == '/' ? "" : "/") + m_prjName + ".cpinstall";
       ofstream missingPacks(filename);
       for (const auto& pack : packList) {
         const string& packID = pack.vendor + "::" + pack.name + (pack.version.empty() ? "" : "@" + pack.version);
@@ -163,7 +163,7 @@ void CbuildModel::Init(const string &file, const string &rtePath) {
 
   fs::path name(file);
   m_prjName = name.filename().replace_extension("").generic_string();
-  m_targetName = m_prjName;   // project and target have same name
+  m_targetName = m_cprjProject->GetActiveTargetName();
 }
 
 bool CbuildModel::GenerateFixedCprj(const string& update) {

diff --git a/...ples/AC6/Asm/RTE/_Target/RTE_Components.h → ...es/AC6/Asm/RTE/_Target_1/RTE_Components.h b/...ples/AC6/Asm/RTE/_Target/RTE_Components.h → ...es/AC6/Asm/RTE/_Target_1/RTE_Components.h
diff --git a/...hProtection/RTE/_Project/RTE_Components.h → ...Protection/RTE/_Target_1/RTE_Components.h b/...hProtection/RTE/_Project/RTE_Components.h → ...Protection/RTE/_Target_1/RTE_Components.h
diff --git a/...uild_AC6/RTE/_Simulation/RTE_Components.h → .../Build_AC6/RTE/_Target_1/RTE_Components.h b/...uild_AC6/RTE/_Simulation/RTE_Components.h → .../Build_AC6/RTE/_Target_1/RTE_Components.h
diff --git a/...ld_AC6PP/RTE/_Simulation/RTE_Components.h → ...uild_AC6PP/RTE/_Target_1/RTE_Components.h b/...ld_AC6PP/RTE/_Simulation/RTE_Components.h → ...uild_AC6PP/RTE/_Target_1/RTE_Components.h
diff --git a/...es/AC6/Flags/RTE/_Target/RTE_Components.h → .../AC6/Flags/RTE/_Target_1/RTE_Components.h b/...es/AC6/Flags/RTE/_Target/RTE_Components.h → .../AC6/Flags/RTE/_Target_1/RTE_Components.h
diff --git a/...AC6/Library/RTE/_project/RTE_Components.h → ...C6/Library/RTE/_Target_1/RTE_Components.h b/...AC6/Library/RTE/_project/RTE_Components.h → ...C6/Library/RTE/_Target_1/RTE_Components.h
diff --git a/...6/Minimal/RTE/_MyProject/RTE_Components.h → ...C6/Minimal/RTE/_Target_1/RTE_Components.h b/...6/Minimal/RTE/_MyProject/RTE_Components.h → ...C6/Minimal/RTE/_Target_1/RTE_Components.h
diff --git a/...estedGroups/RTE/_Project/RTE_Components.h → ...stedGroups/RTE/_Target_1/RTE_Components.h b/...estedGroups/RTE/_Project/RTE_Components.h → ...stedGroups/RTE/_Target_1/RTE_Components.h
diff --git a/...elativePath/RTE/_Project/RTE_Components.h → ...lativePath/RTE/_Target_1/RTE_Components.h b/...elativePath/RTE/_Project/RTE_Components.h → ...lativePath/RTE/_Target_1/RTE_Components.h
diff --git a/...TE/_FVP_Simulation_Model/RTE_Components.h → ...ne/CM33_ns/RTE/_Target_1/RTE_Components.h b/...TE/_FVP_Simulation_Model/RTE_Components.h → ...ne/CM33_ns/RTE/_Target_1/RTE_Components.h
diff --git a/...TE/_FVP_Simulation_Model/RTE_Components.h → ...one/CM33_s/RTE/_Target_1/RTE_Components.h b/...TE/_FVP_Simulation_Model/RTE_Components.h → ...one/CM33_s/RTE/_Target_1/RTE_Components.h
diff --git a/...tespace/RTE/_Target_Name/RTE_Components.h → ...Whitespace/RTE/_Target_1/RTE_Components.h b/...tespace/RTE/_Target_Name/RTE_Components.h → ...Whitespace/RTE/_Target_1/RTE_Components.h