Skip to content

Commit 816ecc8

Browse files
brondanibrondani
authored
[csolution] Remove filtering of component files having gen* categories
1 parent a2292a0 commit 816ecc8

File tree

9 files changed

+151
-19
lines changed

9 files changed

+151
-19
lines changed

‎test/packs/ARM/RteTestGenerator/0.1.0/ARM.RteTestGenerator.pdsc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@
186186
</component>
187187
<component generator="RteTestExternalGenerator" Cclass="RteTestGenerator" Cgroup="Check Global Generator" Cversion="0.9.0">
188188
<description>Component addressing external</description>
189+
<files>
190+
<file category="header" name="Include/RteTestInc.h" version ="1.0.0"/>
191+
<file category="genAsset" name="Templates/RteTest.gpdsc.template" version ="1.0.0"/>
192+
<file category="genHeader" name="Templates/RteTestGen.h.template" version ="1.0.0"/>
193+
<file category="genSource" name="Templates/RteTestGen.c.template" version ="1.0.0"/>
194+
<file category="genParams" name="Generator with spaces/RteTestGen.params" version ="0.9.0" attr="config"/>
195+
</files>
189196
</component>
190197
<component generator="RteTestGeneratorIdentifier" Cvendor="ARM" Cclass="Device" Cgroup="RteTest Generated Component" Csub="RteTestOverlap" Cversion="1.1.0">
191198
<description>Component with overlaping file lists</description>

‎tools/projmgr/src/ProjMgrWorker.cpp‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,15 +2334,6 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) {
23342334
const auto& language = componentFile->GetAttribute("language");
23352335
const auto& select = componentFile->GetAttribute("select");
23362336
const auto& version = componentFile->GetSemVer();
2337-
switch (RteFile::CategoryFromString(category)) {
2338-
case RteFile::Category::GEN_SOURCE:
2339-
case RteFile::Category::GEN_HEADER:
2340-
case RteFile::Category::GEN_PARAMS:
2341-
case RteFile::Category::GEN_ASSET:
2342-
continue; // ignore gen files
2343-
default:
2344-
break;
2345-
};
23462337
context.componentFiles[componentId].push_back({ name, attr, category, language, scope, version, select });
23472338
}
23482339
// config files
@@ -2357,21 +2348,12 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) {
23572348
const auto& category = configFile->GetAttribute("category");
23582349
const auto& language = configFile->GetAttribute("language");
23592350
const auto& scope = configFile->GetAttribute("scope");
2360-
switch (RteFile::CategoryFromString(category)) {
2361-
case RteFile::Category::GEN_SOURCE:
2362-
case RteFile::Category::GEN_HEADER:
2363-
case RteFile::Category::GEN_PARAMS:
2364-
case RteFile::Category::GEN_ASSET:
2365-
continue; // ignore gen files
2366-
default:
2367-
break;
2368-
};
23692351
const auto& version = originalFile ? originalFile->GetSemVer() : "";
23702352
context.componentFiles[componentId].push_back({ filename, "config", category, language, scope, version });
23712353
}
23722354
}
23732355
}
2374-
// input files for component generator. This list of files is directly fetched from the PDSC.
2356+
// input files for 'bootstrap' component generator. This list of files is directly fetched from the PDSC.
23752357
RteComponentInstance* rteBootstrapInstance = context.bootstrapComponents.find(componentId) != context.bootstrapComponents.end() ?
23762358
context.bootstrapMap.find(componentId) != context.bootstrapMap.end() ? context.bootstrapComponents.at(context.bootstrapMap.at(componentId)).instance :
23772359
context.bootstrapComponents.at(componentId).instance : nullptr;
@@ -2396,6 +2378,16 @@ bool ProjMgrWorker::ProcessComponentFiles(ContextItem& context) {
23962378
const auto& filename = (attr == "config" && configFilePaths.find(rteFile) != configFilePaths.end()) ?
23972379
configFilePaths[rteFile] : rteFile->GetOriginalAbsolutePath();
23982380
context.generatorInputFiles[componentId].push_back({ filename, attr, category, language, scope, version });
2381+
// remove file from parent component list to avoid duplicates
2382+
auto& componentFiles = context.componentFiles[componentId];
2383+
componentFiles.erase(
2384+
std::remove_if(
2385+
componentFiles.begin(),
2386+
componentFiles.end(),
2387+
[filename](const ComponentFileItem& item) { return item.name == filename;}
2388+
),
2389+
componentFiles.end()
2390+
);
23992391
}
24002392
}
24012393
}

‎tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ build-gen:
3030
- _RTE_
3131
add-path:
3232
- ${DEVTOOLS(data)}/ExternalGenerator/multi_0/RTE/_Debug_MultiCore
33+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
3334
- ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include
3435
add-path-asm:
3536
- ${DEVTOOLS(data)}/ExternalGenerator/multi_0/RTE/_Debug_MultiCore
37+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
3638
- ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include
3739
output-dirs:
3840
intdir: ${DEVTOOLS(data)}/ExternalGenerator/tmp
@@ -45,6 +47,23 @@ build-gen:
4547
- component: ARM::RteTestGenerator:Check Global [email protected]
4648
from-pack: ARM::[email protected]
4749
selected-by: RteTestGenerator:Check Global Generator
50+
files:
51+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
52+
category: header
53+
version: 1.0.0
54+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
55+
category: genAsset
56+
version: 1.0.0
57+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
58+
category: genSource
59+
version: 1.0.0
60+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
61+
category: genHeader
62+
version: 1.0.0
63+
- file: ${DEVTOOLS(data)}/ExternalGenerator/multi_0/RTE/RteTestGenerator/RteTestGen.params
64+
category: genParams
65+
attr: config
66+
version: 0.9.0
4867
generator:
4968
id: RteTestExternalGenerator
5069
path: ${DEVTOOLS(data)}/ExternalGenerator/generated/MultiCore/core0.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ build-gen:
3030
- _RTE_
3131
add-path:
3232
- ${DEVTOOLS(data)}/ExternalGenerator/multi_1/RTE/_Debug_MultiCore
33+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
3334
- ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include
3435
add-path-asm:
3536
- ${DEVTOOLS(data)}/ExternalGenerator/multi_1/RTE/_Debug_MultiCore
37+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
3638
- ${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM0/Include
3739
output-dirs:
3840
intdir: ${DEVTOOLS(data)}/ExternalGenerator/tmp
@@ -45,6 +47,23 @@ build-gen:
4547
- component: ARM::RteTestGenerator:Check Global [email protected]
4648
from-pack: ARM::[email protected]
4749
selected-by: RteTestGenerator:Check Global Generator
50+
files:
51+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
52+
category: header
53+
version: 1.0.0
54+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
55+
category: genAsset
56+
version: 1.0.0
57+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
58+
category: genSource
59+
version: 1.0.0
60+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
61+
category: genHeader
62+
version: 1.0.0
63+
- file: ${DEVTOOLS(data)}/ExternalGenerator/multi_1/RTE/RteTestGenerator/RteTestGen.params
64+
category: genParams
65+
attr: config
66+
version: 0.9.0
4867
generator:
4968
id: RteTestExternalGenerator
5069
path: ${DEVTOOLS(data)}/ExternalGenerator/generated/MultiCore/core1.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ build:
4444
- ../../../../single/generated/RTE/RteTest
4545
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/GlobalLevel
4646
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Include
47+
- ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include
4748
- ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM4/Include
4849
add-path-asm:
4950
- ../../../../single/RTE/_Debug_Board
5051
- ../../../../single/generated/RTE/RteTest
5152
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/GlobalLevel
5253
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Include
54+
- ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include
5355
- ${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Device/ARM/ARMCM4/Include
5456
output-dirs:
5557
intdir: ../../../../tmp
@@ -86,6 +88,23 @@ build:
8688
- component: ARM::RteTestGenerator:Check Global [email protected]
8789
from-pack: ARM::[email protected]
8890
selected-by: RteTestGenerator:Check Global Generator
91+
files:
92+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
93+
category: header
94+
version: 1.0.0
95+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
96+
category: genAsset
97+
version: 1.0.0
98+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
99+
category: genSource
100+
version: 1.0.0
101+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
102+
category: genHeader
103+
version: 1.0.0
104+
- file: ../../../../single/RTE/RteTestGenerator/RteTestGen.params
105+
category: genParams
106+
attr: config
107+
version: 0.9.0
89108
generator:
90109
id: RteTestExternalGenerator
91110
path: ../../../../single/generated/single-core.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ build-gen:
1919
- _RTE_
2020
add-path:
2121
- ${DEVTOOLS(data)}/ExternalGenerator/single/RTE/_Debug_CM0
22+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2223
add-path-asm:
2324
- ${DEVTOOLS(data)}/ExternalGenerator/single/RTE/_Debug_CM0
25+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2426
output-dirs:
2527
intdir: ${DEVTOOLS(data)}/ExternalGenerator/tmp
2628
outdir: ${DEVTOOLS(data)}/ExternalGenerator/out/single-core/CM0/Debug
@@ -32,6 +34,23 @@ build-gen:
3234
- component: ARM::RteTestGenerator:Check Global [email protected]
3335
from-pack: ARM::[email protected]
3436
selected-by: RteTestGenerator:Check Global Generator
37+
files:
38+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
39+
category: header
40+
version: 1.0.0
41+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
42+
category: genAsset
43+
version: 1.0.0
44+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
45+
category: genSource
46+
version: 1.0.0
47+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
48+
category: genHeader
49+
version: 1.0.0
50+
- file: ${DEVTOOLS(data)}/ExternalGenerator/single/RTE/RteTestGenerator/RteTestGen.params
51+
category: genParams
52+
attr: config
53+
version: 0.9.0
3554
generator:
3655
id: RteTestExternalGenerator
3756
path: ${DEVTOOLS(data)}/ExternalGenerator/single/generated/single-core.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ build:
2222
- ../../../../single/generated/RTE/RteTest
2323
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/GlobalLevel
2424
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Include
25+
- ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include
2526
add-path-asm:
2627
- ../../../../single/RTE/_Debug_CM0
2728
- ../../../../single/generated/RTE/RteTest
2829
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/GlobalLevel
2930
- ${CMSIS_PACK_ROOT}/ARM/RteTest/0.1.0/Include
31+
- ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include
3032
output-dirs:
3133
intdir: ../../../../tmp
3234
outdir: .
@@ -63,6 +65,23 @@ build:
6365
- component: ARM::RteTestGenerator:Check Global [email protected]
6466
from-pack: ARM::[email protected]
6567
selected-by: RteTestGenerator:Check Global Generator
68+
files:
69+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
70+
category: header
71+
version: 1.0.0
72+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
73+
category: genAsset
74+
version: 1.0.0
75+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
76+
category: genSource
77+
version: 1.0.0
78+
- file: ${CMSIS_PACK_ROOT}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
79+
category: genHeader
80+
version: 1.0.0
81+
- file: ../../../../single/RTE/RteTestGenerator/RteTestGen.params
82+
category: genParams
83+
attr: config
84+
version: 0.9.0
6685
generator:
6786
id: RteTestExternalGenerator
6887
path: ../../../../single/generated/single-core.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ build-gen:
2020
- _RTE_
2121
add-path:
2222
- ${DEVTOOLS(data)}/ExternalGenerator/tz_ns/RTE/_Debug_CM0
23+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2324
add-path-asm:
2425
- ${DEVTOOLS(data)}/ExternalGenerator/tz_ns/RTE/_Debug_CM0
26+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2527
output-dirs:
2628
intdir: ${DEVTOOLS(data)}/ExternalGenerator/tmp
2729
outdir: ${DEVTOOLS(data)}/ExternalGenerator/out/ns/CM0/Debug
@@ -33,6 +35,23 @@ build-gen:
3335
- component: ARM::RteTestGenerator:Check Global [email protected]
3436
from-pack: ARM::[email protected]
3537
selected-by: RteTestGenerator:Check Global Generator
38+
files:
39+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
40+
category: header
41+
version: 1.0.0
42+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
43+
category: genAsset
44+
version: 1.0.0
45+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
46+
category: genSource
47+
version: 1.0.0
48+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
49+
category: genHeader
50+
version: 1.0.0
51+
- file: ${DEVTOOLS(data)}/ExternalGenerator/tz_ns/RTE/RteTestGenerator/RteTestGen.params
52+
category: genParams
53+
attr: config
54+
version: 0.9.0
3655
generator:
3756
id: RteTestExternalGenerator
3857
path: ${DEVTOOLS(data)}/ExternalGenerator/generated/CM0/ns.cgen.yml

‎tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ build-gen:
2020
- _RTE_
2121
add-path:
2222
- ${DEVTOOLS(data)}/ExternalGenerator/tz_s/RTE/_Debug_CM0
23+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2324
add-path-asm:
2425
- ${DEVTOOLS(data)}/ExternalGenerator/tz_s/RTE/_Debug_CM0
26+
- ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include
2527
output-dirs:
2628
intdir: ${DEVTOOLS(data)}/ExternalGenerator/tmp
2729
outdir: ${DEVTOOLS(data)}/ExternalGenerator/out/s/CM0/Debug
@@ -35,6 +37,23 @@ build-gen:
3537
- component: ARM::RteTestGenerator:Check Global [email protected]
3638
from-pack: ARM::[email protected]
3739
selected-by: RteTestGenerator:Check Global Generator
40+
files:
41+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Include/RteTestInc.h
42+
category: header
43+
version: 1.0.0
44+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTest.gpdsc.template
45+
category: genAsset
46+
version: 1.0.0
47+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.c.template
48+
category: genSource
49+
version: 1.0.0
50+
- file: ${DEVTOOLS(packs)}/ARM/RteTestGenerator/0.1.0/Templates/RteTestGen.h.template
51+
category: genHeader
52+
version: 1.0.0
53+
- file: ${DEVTOOLS(data)}/ExternalGenerator/tz_s/RTE/RteTestGenerator/RteTestGen.params
54+
category: genParams
55+
attr: config
56+
version: 0.9.0
3857
generator:
3958
id: RteTestExternalGenerator
4059
path: ${DEVTOOLS(data)}/ExternalGenerator/generated/CM0/s.cgen.yml

0 commit comments

Comments
 (0)