Add the board-pack-path: and device-pack-path: in cbuild-run.yml

tools/projmgr/include/ProjMgrRunDebug.h

@@ -211,8 +211,10 @@ struct RunDebugType {
   std::string compiler;
   std::string board;
   std::string boardPack;
+  std::string boardPackPath;
   std::string device;
   std::string devicePack;
+  std::string devicePackPath;
   std::vector<AlgorithmType> algorithms;
   std::vector<FlashInfoType> flashInfo;
   std::vector<FilesType> outputs;

tools/projmgr/include/ProjMgrYamlParser.h

@@ -41,6 +41,7 @@ static constexpr const char* YAML_BLOCKS = "blocks";
 static constexpr const char* YAML_BOARD = "board";
 static constexpr const char* YAML_BOARD_BOOKS = "board-books";
 static constexpr const char* YAML_BOARD_PACK = "board-pack";
+static constexpr const char* YAML_BOARD_PACK_PATH = "board-pack-path";
 static constexpr const char* YAML_BRANCH_PROTECTION = "branch-protection";
 static constexpr const char* YAML_BUILD = "build";
 static constexpr const char* YAML_BUILD_GEN = "build-gen";
@@ -103,6 +104,7 @@ static constexpr const char* YAML_DESCRIPTION = "description";
 static constexpr const char* YAML_DEVICE = "device";
 static constexpr const char* YAML_DEVICE_BOOKS = "device-books";
 static constexpr const char* YAML_DEVICE_PACK = "device-pack";
+static constexpr const char* YAML_DEVICE_PACK_PATH = "device-pack-path";
 static constexpr const char* YAML_DORMANT = "dormant";
 static constexpr const char* YAML_DOWNLOAD_URL = "download-url";
 static constexpr const char* YAML_DPID = "dpid";

tools/projmgr/schemas/common.schema.json

@@ -2433,8 +2433,10 @@
         "compiler":            { "type": "string", "description": "Compiler toolchain used for code generation." },
         "board":               { "$ref": "#/definitions/BoardType" },
         "board-pack":          { "$ref": "#/definitions/PackID" },
+        "board-pack-path":     { "type": "string", "description": "Local path to the board pack." },
         "device":              { "$ref": "#/definitions/DeviceType" },
         "device-pack":         { "$ref": "#/definitions/PackID" },
+        "device-pack-path":    { "type": "string", "description": "Local path to the device pack." },
         "output":              { "$ref": "#/definitions/RunOutputFilesType" },
         "system-resources":    { "$ref": "#/definitions/SystemResourcesType" },
         "system-descriptions": { "$ref": "#/definitions/RunSystemFilesType" },

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -47,8 +47,14 @@ ProjMgrCbuildRun::ProjMgrCbuildRun(YAML::Node node,
   SetNodeValue(node[YAML_COMPILER], debugRun.compiler);
   SetNodeValue(node[YAML_BOARD], debugRun.board);
   SetNodeValue(node[YAML_BOARD_PACK], debugRun.boardPack);
+  if (!debugRun.boardPackPath.empty()) {
+    SetNodeValue(node[YAML_BOARD_PACK_PATH], FormatPath(debugRun.boardPackPath, m_directory));
+  }
   SetNodeValue(node[YAML_DEVICE], debugRun.device);
   SetNodeValue(node[YAML_DEVICE_PACK], debugRun.devicePack);
+  if (!debugRun.devicePackPath.empty()) {
+    SetNodeValue(node[YAML_DEVICE_PACK_PATH], FormatPath(debugRun.devicePackPath, m_directory));
+  }
   SetFilesNode(node[YAML_OUTPUT], debugRun.outputs);
   SetResourcesNode(node[YAML_SYSTEM_RESOURCES], debugRun.systemResources);
   SetFilesNode(node[YAML_SYSTEM_DESCRIPTIONS], debugRun.systemDescriptions);

tools/projmgr/src/ProjMgrRunDebug.cpp

@@ -70,7 +70,6 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
   // device collections
   for (const auto& [pname, processor] : pnames) {
     if (context0->devicePack) {
-      m_runDebug.devicePack = context0->devicePack->GetPackageID(true);
       const auto& deviceAlgorithms = context0->rteDevice->GetEffectiveProperties("algorithm", pname);
       for (const auto& deviceAlgorithm : deviceAlgorithms) {
         PushBackUniquely(algorithms, deviceAlgorithm, pname);
@@ -126,6 +125,10 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
     }
     m_runDebug.systemResources.processors.push_back(item);
   }
+  if (context0->devicePack) {
+    m_runDebug.devicePack = context0->devicePack->GetPackageID(true);
+    m_runDebug.devicePackPath = context0->devicePack->GetAbsolutePackagePath();
+  }
 
   // default ramstart/size: use the first memory with default=1 and rwx attribute
   // if not found, use ramstart/size from other algorithm in DFP
@@ -156,6 +159,7 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts, cons
   // board collections
   if (context0->boardPack) {
     m_runDebug.boardPack = context0->boardPack->GetPackageID(true);
+    m_runDebug.boardPackPath = context0->boardPack->GetAbsolutePackagePath();
     Collection<RteItem*> boardAlgorithms;
     context0->rteBoard->GetChildrenByTag("algorithm", boardAlgorithms);
     for (const auto& boardAlgorithm : boardAlgorithms) {

tools/projmgr/test/data/ImageOnly/ref/image-only+CM0.cbuild-run.yml

@@ -5,6 +5,7 @@ cbuild-run:
   target-set: <default>
   device: ARM::RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: ../images/image1.elf
       type: elf

tools/projmgr/test/data/ImageOnly/ref/image-only-multicore+CM0.cbuild-run.yml

@@ -5,6 +5,7 @@ cbuild-run:
   target-set: <default>
   device: ARM::RteTest_ARMCM0_Dual
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: ../images/image1.elf
       type: elf

tools/projmgr/test/data/TestRunDebug/ref/custom+TestHW.cbuild-run.yml

@@ -6,6 +6,7 @@ cbuild-run:
   compiler: AC6
   device: ARM::RteTest_ARMCM4_NOFP
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: custom/TestHW/custom.axf
       info: generate by custom+TestHW

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml

@@ -6,8 +6,10 @@ cbuild-run:
   compiler: AC6
   board: Keil::RteTest Test device variant:1.1.1
   board-pack: ARM::RteTest_DFP@0.2.0
+  board-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   device: ARM::RteTest_ARMCM4_NOFP
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: run-debug/TestHW/run-debug.axf
       info: generate by run-debug+TestHW

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW2.cbuild-run.yml

@@ -6,8 +6,10 @@ cbuild-run:
   compiler: AC6
   board: Keil::RteTest-Test-board With.Memory:1.1.1
   board-pack: ARM::RteTest_DFP@0.2.0
+  board-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   device: ARM::RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: run-debug/TestHW2/run-debug.axf
       info: generate by run-debug+TestHW2

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml

@@ -6,6 +6,7 @@ cbuild-run:
   compiler: AC6
   device: ARM::RteTest_ARMCM0_Dual
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: core0/TestHW3/core0.axf
       info: generate by core0+TestHW3

tools/projmgr/test/data/WestSupport/ref/solution+CM0.cbuild-run.yml

@@ -6,8 +6,10 @@ cbuild-run:
   compiler: AC6
   board: Keil::RteTest Dummy board:1.2.3
   board-pack: ARM::RteTest_DFP@0.2.0
+  board-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   device: ARM::RteTest_ARMCM0_Dual
   device-pack: ARM::RteTest_DFP@0.2.0
+  device-pack-path: ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0
   output:
     - file: core0/CM0/Debug/zephyr/zephyr.elf
       info: generate by core0.Debug+CM0