Skip to content

Commit

Permalink
[projmgr] Fix CPRJ package requirements generation
Browse files Browse the repository at this point in the history 
- Fixed version with minimum and maximum versions
- Pack path relative to the CPRJ itself
  • Loading branch information
@grasci-arm
grasci-arm authored Apr 25, 2022
1 parent 2475dee commit 4109314
Show file tree
Hide file tree
Showing 49 changed files with 58 additions and 56 deletions.
6 changes: 4 additions & 2 deletions tools/projmgr/src/ProjMgrGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,14 @@ void ProjMgrGenerator::GenerateCprjPackages(XMLTreeElement* element, const Conte
if (packageElement) {
packageElement->AddAttribute("name", package.second->GetName());
packageElement->AddAttribute("vendor", package.second->GetVendorName());
packageElement->AddAttribute("version", package.second->GetVersionString());
const auto& version = package.second->GetVersionString();
packageElement->AddAttribute("version", version + ":" + version);
const string& pdscFile = package.second->GetPackageFileName();
if (context.pdscFiles.find(pdscFile) != context.pdscFiles.end()) {
const string& packPath = context.pdscFiles.at(pdscFile);
if (!packPath.empty()) {
packageElement->AddAttribute("path", packPath);
error_code ec;
packageElement->AddAttribute("path", fs::relative(packPath, context.directories.cprj, ec).generic_string());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/src/ProjMgrWorker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ bool ProjMgrWorker::GetRequiredPdscFiles(ContextItem& context, const std::string
ProjMgrLogger::Warn("no pack loaded as multiple pdsc files found under: " + packItem.path);
}
else {
context.pdscFiles.insert({ pdscFilesList[0].generic_string(), fs::path(packItem.path).generic_string() });
context.pdscFiles.insert({ pdscFilesList[0].generic_string(), packPath });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ccessSequences/ref/test-access-sequences1.Debug+CM0/test-access-sequences1.Debug+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...ccessSequences/ref/test-access-sequences1.Debug+CM3/test-access-sequences1.Debug+CM3.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...sSequences/ref/test-access-sequences1.Release+CM0/test-access-sequences1.Release+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...sSequences/ref/test-access-sequences1.Release+CM3/test-access-sequences1.Release+CM3.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...ccessSequences/ref/test-access-sequences2.Debug+CM0/test-access-sequences2.Debug+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...ccessSequences/ref/test-access-sequences2.Debug+CM3/test-access-sequences2.Debug+CM3.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...sSequences/ref/test-access-sequences2.Release+CM0/test-access-sequences2.Release+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...sSequences/ref/test-access-sequences2.Release+CM3/test-access-sequences2.Release+CM3.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...ta/TestAccessSequences/ref/test-access-sequences3.Debug/test-access-sequences3.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion ...estAccessSequences/ref/test-access-sequences3.Release/test-access-sequences3.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/build-types/project.AC6/project.AC6.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/build-types/project.Debug/project.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/build-types/project.IAR/project.IAR.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/build-types/project.Release/project.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/empty/project.Debug/project.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/empty/project.Release/project.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1"/>
<package name="RteTest_DFP" vendor="ARM" version="0.1.1:0.1.1"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/full/project.Debug/project.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestDefault/ref/full/project.Release/project.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTestGenerator" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTestGenerator" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestLayers/ref/testlayers.Debug/testlayers.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/data/TestLayers/ref/testlayers.Release/testlayers.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTest" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestLayers/ref2/testlayers.Debug.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/data/TestLayers/ref2/testlayers.Release.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTest" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestProject/GenerateCprjTest.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestProject/test.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestProject/test_linker_script.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestProject/test_only_board.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/multicore+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/pack_path+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" path="../SolutionSpecificPack" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" path="../../data/SolutionSpecificPack" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test1.Debug+CM0/test1.Debug+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/data/TestSolution/ref/test1.Debug+CM0/test1.Debug+CM0_board_package.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTestBoard" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTestBoard" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test1.Release+CM0/test1.Release+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions ...projmgr/test/data/TestSolution/ref/test1.Release+CM0/test1.Release+CM0_board_package.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTestBoard" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTestBoard" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test2.Debug+CM0/test2.Debug+CM0.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test2.Debug+CM0/test2.Debug+CM0_pack_selection.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test2.Debug+CM0/test2.Debug+CM0_pname.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test2.Debug+CM3/test2.Debug+CM3.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TestSolution/ref/test2.Debug+CM3/test2.Debug+CM3_pname.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/data/TestSolution/ref/test2.Debug+TestGen/test2.Debug+TestGen.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</info>

<packages>
<package name="RteTestGenerator" vendor="ARM" version="0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0"/>
<package name="RteTestGenerator" vendor="ARM" version="0.1.0:0.1.0"/>
<package name="RteTest_DFP" vendor="ARM" version="0.2.0:0.2.0"/>
</packages>

<compilers>
Expand Down
2 changes: 1 addition & 1 deletion tools/projmgr/test/data/TrustZoneSolution/NonSecureCode/NonSecure.Debug+CM33.cprj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</info>

<packages>
<package name="CMSIS" vendor="ARM" version="5.8.0"/>
<package name="CMSIS" vendor="ARM" version="5.8.0:5.8.0"/>
</packages>

<compilers>
Expand Down
Loading

0 comments on commit 4109314

Please sign in to comment.