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

* Stop generating BridgeGlobalStructs.h * Restyled by autopep8 * Remove more references to BridgeGlobalStructs * undo submodule changes --------- Co-authored-by: Andrei Litvin <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Jun 2, 2023 · eb8131e · eb8131e
1 parent 24e829b
commit eb8131e
Show file tree

Hide file tree

Showing 19 changed files with 0 additions and 118 deletions.
diff --git a/examples/dynamic-bridge-app/linux/BUILD.gn b/examples/dynamic-bridge-app/linux/BUILD.gn
@@ -40,7 +40,6 @@ chip_codegen("chip-bridge-codegen") {
     "bridge/Switch.h",
     "bridge/TemperatureMeasurement.h",
     "bridge/BridgeClustersImpl.h",
-    "bridge/BridgeGlobalStructs.h",
   ]
 }
 

diff --git a/scripts/py_matter_idl/BUILD.gn b/scripts/py_matter_idl/BUILD.gn
@@ -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",
@@ -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",

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja
@@ -1,7 +1,5 @@
 #include <new>
 
-#include "bridge/BridgeGlobalStructs.h"
-
 namespace clusters {
 
 {%- for cluster in clusters %}

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/__init__.py b/scripts/py_matter_idl/matter_idl/generators/bridge/__init__.py
@@ -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,
-            }
-        )
diff --git a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
@@ -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:

diff --git a/...matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h b/...matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
diff --git a/...y_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h b/...y_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/...py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h b/...py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/..._matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h b/..._matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
diff --git a/...py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h b/...py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {