[projmgr] Fix output access sequence

Open-CMSIS-Pack · Apr 17, 2023 · d3bca27 · d3bca27
1 parent 5aa9d3d
commit d3bca27
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -1995,7 +1995,7 @@ bool ProjMgrWorker::ProcessSequenceRelative(ContextItem& context, string& item,
           }
           else if (regex_match(sequence, regex("^Output\\(.*"))) {
             regEx = regex("\\$Output\\(.*\\)\\$");
-            replacement = relOutDir + "/" + (depContext.outputFiles.find("elf") != depContext.outputFiles.end() ? depContext.outputFiles.at("elf") : contextName);
+            replacement = relOutDir + "/" + (depContext.outputFiles.find("elf") != depContext.outputFiles.end() ? depContext.outputFiles.at("elf") : depContext.cproject->name);
           }
           else if (regex_match(sequence, regex("^Source\\(.*"))) {
             regEx = regex("\\$Source\\(.*\\)\\$");

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Debug+CM0.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Debug+CM0.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences1/CM0/Debug" name="test-access-sequences1" outdir="out/test-access-sequences1/CM0/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
     <cxxflags add="-O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.Debug+CM0;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.Debug+CM3;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.Release+CM0;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
     <includes>../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
   </target>
 
@@ -28,7 +28,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences2/CM0/Debug/test-access-sequences2.Debug+CM0_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences2/CM0/Debug/test-access-sequences2_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Debug+CM3.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Debug+CM3.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences1/CM3/Debug" name="test-access-sequences1" outdir="out/test-access-sequences1/CM3/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O1 -g -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
     <cxxflags add="-O1 -g -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.Debug+CM3;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.Debug+CM3;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.Release+CM0;DEF4-PROJ1-out/test-access-sequences2/CM3/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM3-RteTest_ARMCM3</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2;DEF2-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2;DEF4-PROJ1-out/test-access-sequences2/CM3/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM3-RteTest_ARMCM3</defines>
     <includes>../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
   </target>
 
@@ -28,7 +28,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences2/CM3/Debug/test-access-sequences2.Debug+CM3_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences2/CM3/Debug/test-access-sequences2_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Release+CM0.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Release+CM0.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences1/CM0/Release" name="test-access-sequences1" outdir="out/test-access-sequences1/CM0/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
     <cxxflags add="-O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2.Debug+CM0;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2.Release+CM3;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.Release+CM0;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences2/CM0/Debug/test-access-sequences2;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2;DEF4-PROJ1-out/test-access-sequences2/CM0/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM0-RteTest_ARMCM0-</defines>
     <includes>../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
   </target>
 
@@ -28,7 +28,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences2/CM0/Release/test-access-sequences2.Release+CM0_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences2/CM0/Release/test-access-sequences2_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Release+CM3.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences1.Release+CM3.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences1/CM3/Release" name="test-access-sequences1" outdir="out/test-access-sequences1/CM3/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O3 -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
     <cxxflags add="-O3 -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2.Debug+CM3;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2.Release+CM3;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2.Release+CM0;DEF4-PROJ1-out/test-access-sequences2/CM3/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM3-RteTest_ARMCM3</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences2/CM3/Debug/test-access-sequences2;DEF2-PROJ1-out/test-access-sequences2/CM3/Release/test-access-sequences2;DEF3-PROJ1-out/test-access-sequences2/CM0/Release/test-access-sequences2;DEF4-PROJ1-out/test-access-sequences2/CM3/Debug;DEF5-PROJ1-../data/TestAccessSequences;DEF-CM3-RteTest_ARMCM3</defines>
     <includes>../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
   </target>
 
@@ -28,7 +28,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences2/CM3/Release/test-access-sequences2.Release+CM3_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences2/CM3/Release/test-access-sequences2_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Debug+CM0.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Debug+CM0.cprj
@@ -18,8 +18,8 @@
     <output intdir="tmp/test-access-sequences2/CM0/Debug" name="test-access-sequences2" outdir="out/test-access-sequences2/CM0/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="PROJ2-D(RteTest_ARMCM0)-B() -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
     <cxxflags add="PROJ2-D(RteTest_ARMCM0)-B() -O1 -g -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
-    <defines>out/test-access-sequences1/CM0/Debug/test-access-sequences1.Debug+CM0;DEF-CM0-RteTest_ARMCM0-</defines>
-    <includes>out/test-access-sequences1/CM0/Debug/test-access-sequences1.Debug+CM0;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
+    <defines>out/test-access-sequences1/CM0/Debug/test-access-sequences1;DEF-CM0-RteTest_ARMCM0-</defines>
+    <includes>out/test-access-sequences1/CM0/Debug/test-access-sequences1;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
   </target>
 
   <components>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Debug+CM3.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Debug+CM3.cprj
@@ -18,8 +18,8 @@
     <output intdir="tmp/test-access-sequences2/CM3/Debug" name="test-access-sequences2" outdir="out/test-access-sequences2/CM3/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="PROJ2-D(RteTest_ARMCM3)-B() -O1 -g -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
     <cxxflags add="PROJ2-D(RteTest_ARMCM3)-B() -O1 -g -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
-    <defines>out/test-access-sequences1/CM3/Debug/test-access-sequences1.Debug+CM3;DEF-CM3-RteTest_ARMCM3</defines>
-    <includes>out/test-access-sequences1/CM3/Debug/test-access-sequences1.Debug+CM3;../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
+    <defines>out/test-access-sequences1/CM3/Debug/test-access-sequences1;DEF-CM3-RteTest_ARMCM3</defines>
+    <includes>out/test-access-sequences1/CM3/Debug/test-access-sequences1;../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
   </target>
 
   <components>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Release+CM0.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Release+CM0.cprj
@@ -18,8 +18,8 @@
     <output intdir="tmp/test-access-sequences2/CM0/Release" name="test-access-sequences2" outdir="out/test-access-sequences2/CM0/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="PROJ2-D(RteTest_ARMCM0)-B() -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
     <cxxflags add="PROJ2-D(RteTest_ARMCM0)-B() -O3 -C-CPP-RteTest_ARMCM0" compiler="AC6"/>
-    <defines>out/test-access-sequences1/CM0/Release/test-access-sequences1.Release+CM0;DEF-CM0-RteTest_ARMCM0-</defines>
-    <includes>out/test-access-sequences1/CM0/Release/test-access-sequences1.Release+CM0;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
+    <defines>out/test-access-sequences1/CM0/Release/test-access-sequences1;DEF-CM0-RteTest_ARMCM0-</defines>
+    <includes>out/test-access-sequences1/CM0/Release/test-access-sequences1;../data/TestAccessSequences/path/CM0/RteTest_ARMCM0</includes>
   </target>
 
   <components>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Release+CM3.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.Release+CM3.cprj
@@ -18,8 +18,8 @@
     <output intdir="tmp/test-access-sequences2/CM3/Release" name="test-access-sequences2" outdir="out/test-access-sequences2/CM3/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="PROJ2-D(RteTest_ARMCM3)-B() -O3 -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
     <cxxflags add="PROJ2-D(RteTest_ARMCM3)-B() -O3 -C-CPP-RteTest_ARMCM3" compiler="AC6"/>
-    <defines>out/test-access-sequences1/CM3/Release/test-access-sequences1.Release+CM3;DEF-CM3-RteTest_ARMCM3</defines>
-    <includes>out/test-access-sequences1/CM3/Release/test-access-sequences1.Release+CM3;../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
+    <defines>out/test-access-sequences1/CM3/Release/test-access-sequences1;DEF-CM3-RteTest_ARMCM3</defines>
+    <includes>out/test-access-sequences1/CM3/Release/test-access-sequences1;../data/TestAccessSequences/path/CM3/RteTest_ARMCM3</includes>
   </target>
 
   <components>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences3.Debug.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences3.Debug.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences3/Debug" name="test-access-sequences3" outdir="out/test-access-sequences3/Debug" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O1 -g" compiler="AC6"/>
     <cxxflags add="-O1 -g" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences3/Debug/test-access-sequences3.Debug;DEF2-PROJ1-out/test-access-sequences3/Release/test-access-sequences3.Release;Device_RteTest_ARMCM0_Dual_Processor_cm0_core0</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences3/Debug/test-access-sequences3;DEF2-PROJ1-out/test-access-sequences3/Release/test-access-sequences3;Device_RteTest_ARMCM0_Dual_Processor_cm0_core0</defines>
   </target>
 
   <components>
@@ -27,7 +27,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences3/Debug/test-access-sequences3.Debug_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences3/Debug/test-access-sequences3_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>

diff --git a/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences3.Release.cprj b/tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences3.Release.cprj
@@ -18,7 +18,7 @@
     <output intdir="tmp/test-access-sequences3/Release" name="test-access-sequences3" outdir="out/test-access-sequences3/Release" rtedir="../data/TestAccessSequences/RTE" type="exe"/>
     <cflags add="-O3" compiler="AC6"/>
     <cxxflags add="-O3" compiler="AC6"/>
-    <defines>DEF1-PROJ1-out/test-access-sequences3/Debug/test-access-sequences3.Debug;DEF2-PROJ1-out/test-access-sequences3/Release/test-access-sequences3.Release;Device_RteTest_ARMCM0_Dual_Processor_cm0_core0</defines>
+    <defines>DEF1-PROJ1-out/test-access-sequences3/Debug/test-access-sequences3;DEF2-PROJ1-out/test-access-sequences3/Release/test-access-sequences3;Device_RteTest_ARMCM0_Dual_Processor_cm0_core0</defines>
   </target>
 
   <components>
@@ -27,7 +27,7 @@
 
   <files>
     <group name="CMSE">
-      <file category="object" name="out/test-access-sequences3/Release/test-access-sequences3.Release_CMSE_Lib.o"/>
+      <file category="object" name="out/test-access-sequences3/Release/test-access-sequences3_CMSE_Lib.o"/>
     </group>
   </files>
 </cprj>