Skip to content

Commit 750ecf7

Browse files
Make template source files match output names in a consistent manner (project-chip#38886)
* Update file names in sdk generator and templates.json - Renamed files ending in '-src.zapt' to now end with either '.ipp.zapt' or '.cpp.zapt' - Renamed files that created .h files, and/or had names ending in '-header.zapt' to now end in '.h.zapt' - Renamed jinja files referenced in sdk_generator.py to end in '.h.ninja'. - Renamed ClusterMetadataHeader.jinja to Metada.h.jinja * Update file names for all effected zap template files and .jinja files * Codegen from zap and jinja * Update files.gni with new jinja file names * Fix file name and the reference to specific cluster enums zapt file for templates.json * Zap regen * New line formatting issue * Fix lint error based on grep of file name * Add comments linking generated files to their zapt counterparts * zap regen * Change naming based on pr comments * Zap regen * Zap regen * Change naming case based on comment * Zap regen --------- Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent 094244c commit 750ecf7

1,454 files changed

Lines changed: 2915 additions & 43 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
type-safe getters
275275
if: always()
276276
run: |
277-
git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/attribute-table.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
277+
git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/attribute-table.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors.cpp.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
278278
279279
# git grep exits with 0 if it finds a match, but we want
280280
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -295,7 +295,7 @@ jobs:
295295
':(exclude)src/app/util/attribute-table.cpp' \
296296
':(exclude)src/app/util/attribute-table.h' \
297297
':(exclude)src/app/util/mock/CodegenEmberMocks.cpp' \
298-
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' \
298+
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors.cpp.zapt' \
299299
':(exclude)src/darwin/Framework/CHIP/ServerEndpoint/MTRIMDispatch.mm' \
300300
':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
301301
&& exit 1 || exit 0

scripts/py_matter_idl/files.gni

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ matter_idl_generator_templates = [
88
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja",
99
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/application/ServerClusterConfig.jinja",
1010
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/AllItemsBuild.jinja",
11-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/AttributeIds.jinja",
11+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/AttributeIds.h.jinja",
1212
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Build.jinja",
13-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterId.jinja",
14-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterMetadataHeader.jinja",
15-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/CommandIds.jinja",
16-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/EventIds.jinja",
17-
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.jinja",
13+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterId.h.jinja",
14+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Metadata.h.jinja",
15+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/CommandIds.h.jinja",
16+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/EventIds.h.jinja",
17+
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.h.jinja",
1818
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/tlvmeta/TLVMetaData_cpp.jinja",
1919
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/cpp/tlvmeta/TLVMetaData_h.jinja",
2020
"${chip_root}/scripts/py_matter_idl/matter/idl/generators/idl/MatterIdl.jinja",

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/AttributeIds.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/AttributeIds.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterId.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterId.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/CommandIds.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/CommandIds.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/EventIds.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/EventIds.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/ClusterMetadataHeader.jinja renamed to scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Metadata.h.jinja

File renamed without changes.

scripts/py_matter_idl/matter/idl/generators/cpp/sdk/sdk_generator.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ def internal_render_all(self):
123123
"Build.jinja": "BUILD.gn",
124124

125125
# contains `*Entry` items for attributes and commands
126-
"ClusterMetadataHeader.jinja": "Metadata.h",
126+
"Metadata.h.jinja": "Metadata.h",
127127

128128
# contains id definitions
129-
"AttributeIds.jinja": "AttributeIds.h",
130-
"ClusterId.jinja": "ClusterId.h",
131-
"CommandIds.jinja": "CommandIds.h",
132-
"EventIds.jinja": "EventIds.h",
133-
"Ids.jinja": "Ids.h",
129+
"AttributeIds.h.jinja": "AttributeIds.h",
130+
"ClusterId.h.jinja": "ClusterId.h",
131+
"CommandIds.h.jinja": "CommandIds.h",
132+
"EventIds.h.jinja": "EventIds.h",
133+
"Ids.h.jinja": "Ids.h",
134134
}
135135

136136
for template_path, output_file in build_targets.items():

src/app/common/templates/templates.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,146 +40,146 @@
4040
],
4141
"templates": [
4242
{
43-
"path": "../../zap-templates/templates/app/attribute-type.zapt",
43+
"path": "../../zap-templates/templates/app/attribute-type.h.zapt",
4444
"name": "ZCL attribute-type header",
4545
"output": "attribute-type.h"
4646
},
4747
{
48-
"path": "../../zap-templates/templates/app/callback.zapt",
48+
"path": "../../zap-templates/templates/app/callback.h.zapt",
4949
"name": "ZCL callback header",
5050
"output": "callback.h"
5151
},
5252
{
53-
"path": "../../zap-templates/templates/app/attributes/Accessors.zapt",
53+
"path": "../../zap-templates/templates/app/attributes/Accessors.h.zapt",
5454
"name": "Attributes Accessors header",
5555
"output": "attributes/Accessors.h"
5656
},
5757
{
58-
"path": "../../zap-templates/templates/app/attributes/Accessors-src.zapt",
58+
"path": "../../zap-templates/templates/app/attributes/Accessors.cpp.zapt",
5959
"name": "Attributes Accessors",
6060
"output": "attributes/Accessors.cpp"
6161
},
6262
{
63-
"path": "../../zap-templates/templates/app/ids/Attributes.zapt",
63+
"path": "../../zap-templates/templates/app/ids/Attributes.h.zapt",
6464
"name": "Attributes Ids header",
6565
"output": "ids/Attributes.h"
6666
},
6767
{
68-
"path": "../../zap-templates/templates/app/ids/Clusters.zapt",
68+
"path": "../../zap-templates/templates/app/ids/Clusters.h.zapt",
6969
"name": "Clusters Ids header",
7070
"output": "ids/Clusters.h"
7171
},
7272
{
73-
"path": "../../zap-templates/templates/app/ids/Commands.zapt",
73+
"path": "../../zap-templates/templates/app/ids/Commands.h.zapt",
7474
"name": "Commands Ids header",
7575
"output": "ids/Commands.h"
7676
},
7777
{
78-
"path": "../../zap-templates/templates/app/ids/Events.zapt",
78+
"path": "../../zap-templates/templates/app/ids/Events.h.zapt",
7979
"name": "Events Ids header",
8080
"output": "ids/Events.h"
8181
},
8282
{
83-
"path": "../../zap-templates/templates/app/cluster-objects.zapt",
83+
"path": "../../zap-templates/templates/app/cluster-objects.h.zapt",
8484
"name": "Cluster objects header for Interaction Model",
8585
"output": "cluster-objects.h"
8686
},
8787
{
88-
"path": "../../zap-templates/templates/app/cluster-objects-src.zapt",
88+
"path": "../../zap-templates/templates/app/cluster-objects.cpp.zapt",
8989
"name": "Cluster objects source for Interaction Model",
9090
"output": "cluster-objects.cpp"
9191
},
9292
{
93-
"path": "../../zap-templates/templates/app/cluster-enums.zapt",
93+
"path": "../../zap-templates/templates/app/cluster-enums.h.zapt",
9494
"name": "Enum and bitmap header for clusters",
9595
"output": "cluster-enums.h"
9696
},
9797
{
98-
"path": "../../zap-templates/templates/app/cluster-enums-check.zapt",
98+
"path": "../../zap-templates/templates/app/cluster-enums-check.h.zapt",
9999
"name": "Enum and bitmap method check header for clusters",
100100
"output": "cluster-enums-check.h"
101101
},
102102
{
103-
"path": "../../zap-templates/templates/app/shared-cluster-enums-header.zapt",
103+
"path": "../../zap-templates/templates/app/clusters-shared-Enums.h.zapt",
104104
"name": "Shared enumerations header",
105105
"output": "../../clusters/shared/Enums.h"
106106
},
107107
{
108-
"path": "../../zap-templates/templates/app/shared-cluster-enums-check.zapt",
108+
"path": "../../zap-templates/templates/app/clusters-shared-Enums-Check.h.zapt",
109109
"name": "Shared enumeration check header",
110110
"output": "../../clusters/shared/EnumsCheck.h"
111111
},
112112
{
113-
"path": "../../zap-templates/templates/app/shared-cluster-structs.zapt",
113+
"path": "../../zap-templates/templates/app/clusters-shared-Structs.h.zapt",
114114
"name": "Shared/global structures",
115115
"output": "../../clusters/shared/Structs.h"
116116
},
117117
{
118-
"path": "../../zap-templates/templates/app/shared-cluster-structs-src.zapt",
118+
"path": "../../zap-templates/templates/app/clusters-shared-Structs.ipp.zapt",
119119
"name": "Shared/global structures",
120120
"output": "../../clusters/shared/Structs.ipp"
121121
},
122122
{
123-
"path": "../../zap-templates/templates/app/shared-cluster-attributes.zapt",
123+
"path": "../../zap-templates/templates/app/clusters-shared-Attributes.h.zapt",
124124
"name": "Shared/global structures",
125125
"output": "../../clusters/shared/Attributes.h"
126126
},
127127
{
128-
"path": "../../zap-templates/templates/app/cluster-attributes-header.zapt",
128+
"path": "../../zap-templates/templates/app/clusters-Attributes.h.zapt",
129129
"name": "Cluster-specific attribute declarations",
130130
"iterator": "availableCluster",
131131
"output": "../../clusters/{name:touppercamelcase}/Attributes.h"
132132
},
133133
{
134-
"path": "../../zap-templates/templates/app/cluster-events-header.zapt",
134+
"path": "../../zap-templates/templates/app/clusters-Events.h.zapt",
135135
"name": "Cluster-specific event declarations",
136136
"iterator": "availableCluster",
137137
"output": "../../clusters/{name:touppercamelcase}/Events.h"
138138
},
139139
{
140-
"path": "../../zap-templates/templates/app/cluster-events-src.zapt",
140+
"path": "../../zap-templates/templates/app/clusters-Events.ipp.zapt",
141141
"name": "Cluster-specific event implementations",
142142
"iterator": "availableCluster",
143143
"output": "../../clusters/{name:touppercamelcase}/Events.ipp"
144144
},
145145
{
146-
"path": "../../zap-templates/templates/app/cluster-structs-header.zapt",
146+
"path": "../../zap-templates/templates/app/clusters-Structs.h.zapt",
147147
"name": "Cluster-specific structure declarations",
148148
"iterator": "availableCluster",
149149
"output": "../../clusters/{name:touppercamelcase}/Structs.h"
150150
},
151151
{
152-
"path": "../../zap-templates/templates/app/cluster-structs-src.zapt",
152+
"path": "../../zap-templates/templates/app/clusters-Structs.ipp.zapt",
153153
"name": "Cluster-specific structure implementations",
154154
"iterator": "availableCluster",
155155
"output": "../../clusters/{name:touppercamelcase}/Structs.ipp"
156156
},
157157
{
158-
"path": "../../zap-templates/templates/app/cluster-attributes-src.zapt",
158+
"path": "../../zap-templates/templates/app/clusters-Attributes.ipp.zapt",
159159
"name": "Cluster-specific attributes implementations",
160160
"iterator": "availableCluster",
161161
"output": "../../clusters/{name:touppercamelcase}/Attributes.ipp"
162162
},
163163
{
164-
"path": "../../zap-templates/templates/app/cluster-commands-header.zapt",
164+
"path": "../../zap-templates/templates/app/clusters-Commands.h.zapt",
165165
"name": "Cluster-specific command declarations",
166166
"iterator": "availableCluster",
167167
"output": "../../clusters/{name:touppercamelcase}/Commands.h"
168168
},
169169
{
170-
"path": "../../zap-templates/templates/app/cluster-commands-src.zapt",
170+
"path": "../../zap-templates/templates/app/clusters-Commands.ipp.zapt",
171171
"name": "Cluster-specific command implementations",
172172
"iterator": "availableCluster",
173173
"output": "../../clusters/{name:touppercamelcase}/Commands.ipp"
174174
},
175175
{
176-
"path": "../../zap-templates/templates/app/cluster-enums-header.zapt",
176+
"path": "../../zap-templates/templates/app/clusters-Enums.h.zapt",
177177
"name": "Cluster-specific enumerations header",
178178
"iterator": "availableCluster",
179179
"output": "../../clusters/{name:touppercamelcase}/Enums.h"
180180
},
181181
{
182-
"path": "../../zap-templates/templates/app/cluster-enums-check-header.zapt",
182+
"path": "../../zap-templates/templates/app/clusters-Enums-Check.h.zapt",
183183
"name": "Cluster-specific enumerations header",
184184
"iterator": "availableCluster",
185185
"output": "../../clusters/{name:touppercamelcase}/EnumsCheck.h"

0 commit comments

Comments
 (0)