[projmgr] PLM status: consider config file's pre-release qualifier (#1993)

Author: grasci-arm

libs/rtemodel/test/src/RteChkTest.cpp

@@ -30,8 +30,8 @@ Generic: 4\n\
 DFP: 3\n\
 BSP: 1\n\
 \n\
-Components: 58\n\
-From generic packs: 35\n\
+Components: 59\n\
+From generic packs: 36\n\
 From DFP: 23\n\
 From BSP: 0\n\
 \n\
@@ -51,7 +51,7 @@ completed\n";
   int res = rteChk.RunCheckRte();
   EXPECT_EQ(res, 0);
   EXPECT_EQ(rteChk.GetPackCount(), 8);
-  EXPECT_EQ(rteChk.GetComponentCount(), 58);
+  EXPECT_EQ(rteChk.GetComponentCount(), 59);
   EXPECT_EQ(rteChk.GetDeviceCount(), 10);
   EXPECT_EQ(rteChk.GetBoardCount(), 14);
 

test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc

@@ -390,6 +390,13 @@
         <file category="header" attr="template" name="Template/template.h" select="dummy template file"/>
       </files>
     </component>
+
+    <component Cclass="RteTest" Cgroup="TestVersion" Cversion="1.8-dev1">
+      <description>Component version without patch number and with pre-release suffix</description>
+      <files>
+        <file category="header" name="Include/Config/ConfigInclude.h" attr="config"/>
+      </files>
+    </component>
   </components>
 
   <examples>

tools/projmgr/src/ProjMgrWorker.cpp

@@ -2138,7 +2138,7 @@ bool ProjMgrWorker::CheckConfigPLMFiles(ContextItem& context) {
       const string updateVersion = f ? f->GetSemVer(true) : "";
       if (baseVersion != updateVersion) {
         // parse and check each semantic version segment
-        static const regex regEx = regex("(\\d+).(\\d+).(\\d+)");
+        static const regex regEx = regex("(\\d+).(\\d+).(\\d+(?:-.*)*)");
         smatch base, update;
         regex_match(baseVersion, base, regEx);
         regex_match(updateVersion, update, regEx);
@@ -4927,10 +4927,10 @@ bool ProjMgrWorker::ListConfigFiles(vector<string>& configFiles) {
           const string absFile = fs::path(context.cproject->directory).append(fi.second->GetInstanceName()).generic_string();
           configEntry += "\n    - " + absFile;
           // get base version
-          const string baseVersion = fi.second->GetSemVer();
+          const string baseVersion = fi.second->GetSemVer(true);
           configEntry += " (base@" + baseVersion + ")";
           // get update version
-          const string updateVersion = fi.second->GetFile(context.rteActiveTarget->GetName())->GetSemVer();
+          const string updateVersion = fi.second->GetFile(context.rteActiveTarget->GetName())->GetSemVer(true);
           if (updateVersion != baseVersion) {
             configEntry += " (update@" + updateVersion + ")";
           }

tools/projmgr/test/data/TestSolution/ComponentSources/RTE/RteTest/ConfigInclude.h

@@ -0,0 +1 @@
+// Dummy

tools/projmgr/test/data/TestSolution/ComponentSources/RTE/RteTest/[email protected]

@@ -0,0 +1 @@
+// Dummy

tools/projmgr/test/data/TestSolution/ComponentSources/ref/versions.Debug+RteTest_ARMCM3.cbuild.yml

@@ -0,0 +1,76 @@
+build:
+  generated-by: csolution version 2.8.0
+  solution: ../data/TestSolution/ComponentSources/versions.csolution.yml
+  project: ../data/TestSolution/ComponentSources/versions.cproject.yml
+  context: versions.Debug+RteTest_ARMCM3
+  compiler: AC6
+  device: ARM::RteTest_ARMCM3
+  device-pack: ARM::[email protected]
+  device-books:
+    - name: http://infocenter.arm.com/help/topic/com.arm.doc.dui0552a/index.html
+      title: Cortex-M3 Device Generic Users Guide
+  dbgconf:
+    - file: ../data/TestSolution/ComponentSources/RTE/Device/RteTest_ARMCM3/ARMCM.dbgconf
+      version: 0.0.2
+  processor:
+    fpu: off
+    core: Cortex-M3
+  packs:
+    - pack: ARM::[email protected]
+      path: ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0
+    - pack: ARM::[email protected]
+      path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
+  define:
+    - ARMCM3
+    - _RTE_
+  define-asm:
+    - ARMCM3
+    - _RTE_
+  add-path:
+    - ../data/TestSolution/ComponentSources/RTE/RteTest
+    - ../data/TestSolution/ComponentSources/RTE/_Debug_RteTest_ARMCM3
+    - ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include
+  add-path-asm:
+    - ../data/TestSolution/ComponentSources/RTE/RteTest
+    - ../data/TestSolution/ComponentSources/RTE/_Debug_RteTest_ARMCM3
+    - ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM3/Include
+  output-dirs:
+    intdir: tmp
+    outdir: out/versions/RteTest_ARMCM3/Debug
+    rtedir: ../data/TestSolution/ComponentSources/RTE
+  output:
+    - type: elf
+      file: versions.axf
+  components:
+    - component: ARM::RteTest:[email protected]
+      from-pack: ARM::[email protected]
+      selected-by: RteTest:TestVersion
+      files:
+        - file: ../data/TestSolution/ComponentSources/RTE/RteTest/ConfigInclude.h
+          category: header
+          attr: config
+          version: 1.8.0-dev1
+          base: ../data/TestSolution/ComponentSources/RTE/RteTest/[email protected]
+          update: ../data/TestSolution/ComponentSources/RTE/RteTest/[email protected]
+          status: update suggested
+  linker:
+    script: ../data/TestSolution/ComponentSources/RTE/Device/RteTest_ARMCM3/ac6_linker_script.sct.src
+    regions: ../data/TestSolution/ComponentSources/RTE/Device/RteTest_ARMCM3/regions_RteTest_ARMCM3.h
+  constructed-files:
+    - file: ../data/TestSolution/ComponentSources/RTE/_Debug_RteTest_ARMCM3/RTE_Components.h
+      category: header
+  licenses:
+    - license: <unknown>
+      license-agreement: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Doc/license.txt
+      packs:
+        - pack: ARM::[email protected]
+    - license: BSD-3-Clause
+      packs:
+        - pack: ARM::[email protected]
+      components:
+        - component: ARM::RteTest:[email protected]
+    - license: MIT
+      packs:
+        - pack: ARM::[email protected]
+      components:
+        - component: ARM::RteTest:[email protected]

tools/projmgr/test/data/TestSolution/ComponentSources/versions.cproject.yml

@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/cproject.schema.json
+
+project:
+  components:
+    - component: RteTest:TestVersion

tools/projmgr/test/data/TestSolution/ComponentSources/versions.csolution.yml

@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=D:\work\devtools-wip\tools\projmgr\schemas\csolution.schema.json
+
+solution:
+
+  compiler: AC6
+
+  build-types:
+    - type: Debug
+
+  target-types:
+    - type: RteTest_ARMCM3
+      device: RteTest_ARMCM3
+
+  projects:
+    - project: versions.cproject.yml
+
+  packs:
+    - pack: ARM::RteTest
+    - pack: ARM::RteTest_DFP

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -6715,3 +6715,16 @@ error csolution: invalid define: \\\"Mixed_quotes\", improper quotes\n\
   errStr = streamRedirect.GetErrorString();
   EXPECT_EQ(errStr, expected);
 }
+
+TEST_F(ProjMgrUnitTests, ComponentVersions) {
+  char* argv[5];
+  const string& csolution = testinput_folder + "/TestSolution/ComponentSources/versions.csolution.yml";
+  argv[1] = (char*)"convert";
+  argv[2] = (char*)csolution.c_str();
+  argv[3] = (char*)"-o";
+  argv[4] = (char*)testoutput_folder.c_str();
+  EXPECT_EQ(0, RunProjMgr(5, argv, m_envp));
+
+  ProjMgrTestEnv::CompareFile(testoutput_folder + "/versions.Debug+RteTest_ARMCM3.cbuild.yml",
+    testinput_folder + "/TestSolution/ComponentSources/ref/versions.Debug+RteTest_ARMCM3.cbuild.yml");
+}