Skip to content

Skip parsing copied-from to avoid redefinition (#1232) #2104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brondani merged 1 commit into from
Jun 5, 2025
Merged

Skip parsing copied-from to avoid redefinition (#1232) #2104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tools/projmgr/src/ProjMgrYamlParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,15 @@ void ProjMgrYamlParser::ParseVectorOfStringPairs(const YAML::Node& parent, const
if (item.IsMap()) {
const auto& elements = item.as<map<string, string>>();
for (auto element : elements) {
if (YAML::IsNullString(element.second)) {
element.second = "";
// skip parsing variable named "copied-from"
// This is a special case used by the CMSIS csolution extension
// and may involve redefinitions
if (element.first != "copied-from") {
if (YAML::IsNullString(element.second)) {
element.second = "";
}
value.push_back(element);
}
value.push_back(element);
}
} else {
value.push_back(make_pair(item.as<string>(), ""));
Expand Down
2 changes: 2 additions & 0 deletions tools/projmgr/test/data/TestLayers/variables-redefinition.csolution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ solution:
compiler: AC6
variables:
- VariableName: FirstValue
- copied-from: /buildtype/test.yml

target-types:
- type: TargetType
device: RteTest_ARMCM0
variables:
- VariableName: SecondValue
- copied-from: /targettype/test.yml

projects:
- project: variables-redefinition.cproject.yml
Loading