Skip to content

[projmgr] Expand $SolutionDir()$ when used in cproject.yml layer node (#1239) #2110

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
jkrech merged 1 commit into from
Jun 12, 2025
Merged

[projmgr] Expand $SolutionDir()$ when used in cproject.yml layer node (#1239) #2110

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
4 changes: 3 additions & 1 deletion tools/projmgr/src/ProjMgrWorker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ bool ProjMgrWorker::ParseContextLayers(ContextItem& context) {
if (!variable.empty()) {
context.layerVariables[clayer.type] = variable;
}
string clayerFile = RteUtils::ExpandAccessSequences(clayer.layer, context.variables);
auto variables = context.variables;
variables[RteConstants::AS_SOLUTION_DIR_BR] = context.csolution->directory;
string clayerFile = RteUtils::ExpandAccessSequences(clayer.layer, variables);
if (clayerFile.empty()) {
continue;
}
Expand Down
5 changes: 5 additions & 0 deletions tools/projmgr/test/data/TestLayers/ref/variables/variables.cbuild-idx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ build-idx:
- clayer: ../data/TestLayers/$VarTargetLayer$
- clayer: ../data/TestLayers/$VarSolution$
- clayer: ../data/TestLayers/$VarSolutionDir$
- clayer: ../data/TestLayers/$SolutionDir()$/variables/solutionDir2.clayer.yml
cbuilds:
- cbuild: variables.BuildType1+TargetType1.cbuild.yml
project: variables
Expand All @@ -17,6 +18,7 @@ build-idx:
- clayer: ../data/TestLayers/variables/app.clayer.yml
- clayer: ../data/TestLayers/variables/build1.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir2.clayer.yml
- clayer: ../data/TestLayers/variables/target1.clayer.yml
messages:
info:
Expand All @@ -29,6 +31,7 @@ build-idx:
- clayer: ../data/TestLayers/variables/app.clayer.yml
- clayer: ../data/TestLayers/variables/build1.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir2.clayer.yml
- clayer: ../data/TestLayers/variables/target2.clayer.yml
messages:
info:
Expand All @@ -41,6 +44,7 @@ build-idx:
- clayer: ../data/TestLayers/variables/app.clayer.yml
- clayer: ../data/TestLayers/variables/build2.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir2.clayer.yml
- clayer: ../data/TestLayers/variables/target1.clayer.yml
messages:
info:
Expand All @@ -53,6 +57,7 @@ build-idx:
- clayer: ../data/TestLayers/variables/app.clayer.yml
- clayer: ../data/TestLayers/variables/build2.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir.clayer.yml
- clayer: ../data/TestLayers/variables/solutionDir2.clayer.yml
- clayer: ../data/TestLayers/variables/target2.clayer.yml
messages:
info:
Expand Down
1 change: 1 addition & 0 deletions tools/projmgr/test/data/TestLayers/variables.cproject.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ project:
- layer: $VarTargetLayer$
- layer: $VarSolution$
- layer: $VarSolutionDir$
- layer: $SolutionDir()$/variables/solutionDir2.clayer.yml
6 changes: 6 additions & 0 deletions tools/projmgr/test/data/TestLayers/variables/solutionDir2.clayer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/clayer.schema.json

layer:

define:
- SolutionDir-Layer
Loading