[projmgr] Expand non-path access sequences in execute run node

Open-CMSIS-Pack · Sep 12, 2024 · a9e3834 · a9e3834
1 parent f296f91
commit a9e3834
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -2420,6 +2420,7 @@ bool ProjMgrWorker::ProcessExecutes(ContextItem& context, bool solutionLevel) {
       m_executes[execute].execute = execute;
       // expand access sequences
       m_executes[execute].run = RteUtils::ExpandAccessSequences(m_executes[execute].run, IOSeqMap);
+      m_executes[execute].run = RteUtils::ExpandAccessSequences(m_executes[execute].run, context.variables);
       if (!ProcessSequencesRelatives(context, m_executes[execute].input, ref, outDir, true, solutionLevel) ||
         !ProcessSequencesRelatives(context, m_executes[execute].output, ref, outDir, true, solutionLevel)) {
         return false;

diff --git a/tools/projmgr/test/data/TestSolution/Executes/project/project.cproject.yml b/tools/projmgr/test/data/TestSolution/Executes/project/project.cproject.yml
@@ -14,7 +14,7 @@ project:
 
   executes:
     - execute: Sign Artifact
-      run: ${CMAKE_COMMAND} -DINPUT=$input$ -DOUTPUT=$output$ -P $input(0)$
+      run: ${CMAKE_COMMAND} -DINPUT=$input$ -DOUTPUT=$output$ -DCONTEXT=$Project$.$BuildType$+$TargetType$ -P $input(0)$
       input:
         - $SolutionDir()$/script/sign.cmake
         - $elf()$

diff --git a/tools/projmgr/test/data/TestSolution/Executes/ref/solution.cbuild-idx.yml b/tools/projmgr/test/data/TestSolution/Executes/ref/solution.cbuild-idx.yml
@@ -57,7 +57,7 @@ build-idx:
       depends-on:
         - Archive_Artifacts
     - execute: project.Release+RteTest_ARMCM3-Sign_Artifact
-      run: ${CMAKE_COMMAND} -DINPUT=${INPUT} -DOUTPUT=${OUTPUT} -P ${INPUT_0}
+      run: ${CMAKE_COMMAND} -DINPUT=${INPUT} -DOUTPUT=${OUTPUT} -DCONTEXT=project.Release+RteTest_ARMCM3 -P ${INPUT_0}
       input:
         - ../data/TestSolution/Executes/script/sign.cmake
         - out/project/RteTest_ARMCM3/Release/project.axf