Skip to content
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

Stop generating BridgeGlobalStructs.h for dynamic-bridge-app #27020

Merged
merged 4 commits into from
Jun 2, 2023
Merged

Stop generating BridgeGlobalStructs.h for dynamic-bridge-app #27020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afdc7ea
Stop generating BridgeGlobalStructs.h
andreilitvin Jun 1, 2023
f22cabd
Restyled by autopep8
restyled-commits Jun 1, 2023
675091d
Remove more references to BridgeGlobalStructs
andreilitvin Jun 1, 2023
afed3b6
undo submodule changes
andy31415 Jun 1, 2023
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
1 change: 0 additions & 1 deletion examples/dynamic-bridge-app/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ chip_codegen("chip-bridge-codegen") {
"bridge/Switch.h",
"bridge/TemperatureMeasurement.h",
"bridge/BridgeClustersImpl.h",
"bridge/BridgeGlobalStructs.h",
]
}

Expand Down
4 changes: 0 additions & 4 deletions scripts/py_matter_idl/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,16 @@ pw_python_package("matter_idl") {
"matter_idl/tests/inputs/several_clusters.matter",
"matter_idl/tests/inputs/simple_attribute.matter",
"matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h",
"matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h",
"matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h",
"matter_idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
"matter_idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
"matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeClustersImpl.h",
"matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h",
"matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h",
"matter_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
"matter_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
"matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
"matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
"matter_idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h",
"matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h",
"matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h",
"matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h",
"matter_idl/tests/outputs/several_clusters/bridge/Third.h",
Expand All @@ -65,7 +62,6 @@ pw_python_package("matter_idl") {
"matter_idl/tests/outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp",
"matter_idl/tests/outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp",
"matter_idl/tests/outputs/simple_attribute/bridge/BridgeClustersImpl.h",
"matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h",
"matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h",
"matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-ReadImpl.cpp",
"matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
Expand Down
1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
2 changes: 0 additions & 2 deletions scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include <new>

#include "bridge/BridgeGlobalStructs.h"

namespace clusters {

{%- for cluster in clusters %}
Expand Down
9 changes: 0 additions & 9 deletions scripts/py_matter_idl/matter_idl/generators/bridge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,3 @@ def internal_render_all(self):
'idl': self.idl,
}
)

self.internal_render_one_output(
template_path="BridgeClustersGlobalStructs.jinja",
output_file_name="bridge/BridgeGlobalStructs.h",
vars={
'idl': self.idl,
'structs': self.idl.structs,
}
)
5 changes: 0 additions & 5 deletions scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,25 @@ java-class:
bridge:
inputs/simple_attribute.matter:
bridge/BridgeClustersImpl.h: outputs/simple_attribute/bridge/BridgeClustersImpl.h
bridge/BridgeGlobalStructs.h: outputs/simple_attribute/bridge/BridgeGlobalStructs.h
bridge/MyClusterServer.h: outputs/simple_attribute/bridge/MyClusterServer.h

inputs/global_struct_attribute.matter:
bridge/BridgeClustersImpl.h: outputs/global_struct_attribute/bridge/BridgeClustersImpl.h
bridge/BridgeGlobalStructs.h: outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
bridge/DemoClusterServer.h: outputs/global_struct_attribute/bridge/DemoClusterServer.h

inputs/cluster_struct_attribute.matter:
bridge/BridgeClustersImpl.h: outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h
bridge/BridgeGlobalStructs.h: outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
bridge/DemoClusterServer.h: outputs/cluster_struct_attribute/bridge/DemoClusterServer.h

inputs/several_clusters.matter:
bridge/BridgeClustersImpl.h: outputs/several_clusters/bridge/BridgeClustersImpl.h
bridge/BridgeGlobalStructs.h: outputs/several_clusters/bridge/BridgeGlobalStructs.h
bridge/FirstServer.h: outputs/several_clusters/bridge/FirstServer.h
bridge/SecondServer.h: outputs/several_clusters/bridge/SecondServer.h
bridge/ThirdServer.h: outputs/several_clusters/bridge/ThirdServer.h
bridge/Third.h: outputs/several_clusters/bridge/Third.h

inputs/cluster_with_commands.matter:
bridge/BridgeClustersImpl.h: outputs/cluster_with_commands/bridge/BridgeClustersImpl.h
bridge/BridgeGlobalStructs.h: outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
bridge/OnOff.h: outputs/cluster_with_commands/bridge/OnOff.h

cpp-app:
Expand Down
13 changes: 0 additions & 13 deletions ...matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...y_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
13 changes: 0 additions & 13 deletions ...py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
36 changes: 0 additions & 36 deletions ..._matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
13 changes: 0 additions & 13 deletions scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down
13 changes: 0 additions & 13 deletions scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "BridgeGlobalStructs.h"
#include "GeneratedClusters.h"

namespace clusters {
Expand Down