From 05f043db9511c07b4465e155feff20b6e05cfdaa Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 20 Aug 2021 17:50:27 -0400 Subject: [PATCH] Start separating generated files in unique folder instead of inside the src/example tree (#9124) * Start creating a zzz_generated folder * Allow output folder argument in zap generation python script. Verified that regenall was a noop * moved all generated files from examples into zzz_generated (by running regen-all) * Update gen folder as "zap-generated" * Rename gen to zap-generated in includes * More generated path renaming * update the cluster template generation to use the new zap-generated name * Rename more zap generated files * more renames and zapt updates. Fix build rule dependency * Add config dependency on data model: only need include paths * Fix include order. Lighting app on linux compiles * Add TODO regarding config path ordering * Prepare example generated files: nrf builds compile * Make lock app compile on nrf with the new directory structure * update telink makefile to match the new zap generated outputs * More compile logic updates * esp32 compiles now * Make the bridge app compile on esp32 * Exclude zap generated files from doxygen * Fix typo in CHIPCert, move the darwin header/mm files * Update a few more gen folder usages * Update java to zap-generated, move more files around * Restyle fixes * Update path inside pbxproj * Fix up lighting app cmake for mbed * Update lock generated files for esp32 lock app * Update paths for generated file for lock app cmakefiles * One more cmake fix for esp32 * Update CMakeLists.txt for the temperature measurement app * Add back af-gen-event.h even though they are NOT currently generated * Undo the data_model include logic * Move ota-provider-app to zzz_generated * Fix android build * Fix ota provider app build path for zap generated files * Restyle fixes * Fix up ota build * Updated fix for ota provider app build rules * Create ota-provider-app config globally, to fix up includes for common paths * Restyle fixes * Update relative paths into ota-provider-common to use top level include * Do not use relative path in includes in ota provider common --- docs/Doxyfile | 3 ++- .../all-clusters-common/BUILD.gn | 3 ++- .../esp32/main/CMakeLists.txt | 3 ++- examples/bridge-app/bridge-common/BUILD.gn | 2 +- examples/bridge-app/esp32/main/CMakeLists.txt | 4 +-- examples/bridge-app/linux/include/Device.h | 4 +-- examples/chip-tool-darwin/main.m | 2 +- .../chip-tool/commands/clusters/Commands.h | 4 +-- .../commands/pairing/PairingCommand.h | 4 +-- .../commands/reporting/ReportingCommand.cpp | 4 +-- examples/chip-tool/templates/commands.zapt | 4 +-- .../lighting-app/lighting-common/BUILD.gn | 2 +- examples/lighting-app/mbed/CMakeLists.txt | 10 +++++--- .../lighting-app/nrfconnect/CMakeLists.txt | 9 ++++--- examples/lighting-app/telink/CMakeLists.txt | 11 ++++---- examples/lock-app/esp32/main/CMakeLists.txt | 10 ++++---- examples/lock-app/lock-common/BUILD.gn | 2 +- examples/lock-app/mbed/CMakeLists.txt | 11 ++++---- examples/lock-app/nrfconnect/CMakeLists.txt | 11 ++++---- examples/ota-provider-app/linux/main.cpp | 4 +-- .../ota-provider-common/BUILD.gn | 11 +++++++- .../ota-provider-common/BdxOtaSender.cpp | 2 +- .../OTAProviderExample.cpp | 2 +- examples/pump-app/pump-common/BUILD.gn | 2 +- .../pump-controller-common/BUILD.gn | 3 ++- .../esp32/main/CMakeLists.txt | 3 ++- .../thermostat/thermostat-common/BUILD.gn | 2 +- examples/tv-app/tv-common/BUILD.gn | 2 +- examples/window-app/common/BUILD.gn | 2 +- scripts/tools/zap/generate.py | 10 +++++--- scripts/tools/zap_regen_all.py | 25 +++++++++++++++++-- .../clusters/scenes-client/scenes-client.cpp | 2 +- src/app/util/DataModelHandler.cpp | 2 +- src/app/util/af-event.cpp | 2 +- src/app/util/attribute-storage.h | 2 +- src/app/util/binding-table.cpp | 2 +- src/app/util/config.h | 6 ++--- .../util/ember-compatibility-functions.cpp | 2 +- src/app/util/types_stub.h | 4 +-- .../app/CHIPClientCallbacks-src.zapt | 2 +- .../templates/app/CHIPClusters-src.zapt | 2 +- src/controller/CHIPDevice.cpp | 2 +- src/controller/CHIPDevice.h | 2 +- src/controller/CHIPDeviceController.cpp | 2 +- src/controller/CHIPDeviceController.h | 2 +- src/controller/data_model/BUILD.gn | 2 +- .../CHIPClientCallbacks.cpp | 2 +- .../CHIPClientCallbacks.h | 0 .../{gen => zap-generated}/CHIPClusters.cpp | 2 +- .../{gen => zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../{gen => zap-generated}/af-gen-event.h | 0 .../{gen => zap-generated}/attribute-size.cpp | 0 .../{gen => zap-generated}/callback-stub.cpp | 0 .../{gen => zap-generated}/endpoint_config.h | 0 .../{gen => zap-generated}/gen_config.h | 0 .../data_model/zap-generated}/gen_tokens.h | 0 src/controller/java/BUILD.gn | 4 +-- .../java/CHIPDeviceController-JNI.cpp | 4 +-- .../java/templates/CHIPClusters-JNI.zapt | 4 +-- src/controller/java/templates/templates.json | 4 +-- .../CHIPClusters-JNI.cpp | 4 +-- .../{gen => zap-generated}/ChipClusters.java | 0 .../python/chip/clusters/CHIPClusters.cpp | 4 +-- .../templates/python-CHIPClusters-cpp.zapt | 4 +-- src/credentials/CHIPCert.h | 2 +- .../Framework/CHIP.xcodeproj/project.pbxproj | 14 +++++------ src/darwin/Framework/CHIP/BUILD.gn | 4 +-- .../Framework/CHIP/CHIPDeviceController.mm | 2 +- .../CHIP/templates/CHIPClustersObjc-src.zapt | 6 ++--- .../Framework/CHIP/templates/templates.json | 4 +-- .../{gen => zap-generated}/CHIPClustersObjc.h | 0 .../CHIPClustersObjc.mm | 6 ++--- zzz_generated/README.md | 5 ++++ .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../zap-generated}/gen_config.h | 0 .../zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../bridge-app/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../bridge-app/zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../bridge-app/zap-generated}/gen_config.h | 0 .../bridge-app/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../lighting-app/zap-generated}/gen_config.h | 0 .../lighting-app/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../lock-app/zap-generated}/CHIPClusters.cpp | 0 .../lock-app/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../lock-app/zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../lock-app/zap-generated}/callback-stub.cpp | 0 .../lock-app/zap-generated}/endpoint_config.h | 0 .../lock-app/zap-generated}/gen_config.h | 0 .../lock-app/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/call-command-handler.cpp | 0 .../zap-generated}/call-command-handler.h | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/callback.h | 0 .../zap-generated}/chip-zcl-zpro-codec-api.h | 0 .../zap-generated}/encoder.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../zap-generated}/gen_config.h | 0 .../zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 2 +- .../zap-generated}/CHIPClientCallbacks.h | 0 .../pump-app/zap-generated}/CHIPClusters.cpp | 2 +- .../pump-app/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../pump-app/zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../pump-app/zap-generated}/callback-stub.cpp | 0 .../pump-app/zap-generated}/endpoint_config.h | 0 .../pump-app/zap-generated}/gen_config.h | 0 .../pump-app/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 2 +- .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 2 +- .../zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../zap-generated}/gen_config.h | 0 .../zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../zap-generated}/gen_config.h | 0 .../zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../thermostat/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../thermostat/zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../thermostat/zap-generated}/gen_config.h | 0 .../thermostat/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../tv-app/zap-generated}/CHIPClusters.cpp | 0 .../tv-app/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../tv-app/zap-generated}/af-gen-event.h | 0 .../tv-app/zap-generated}/attribute-size.cpp | 0 .../tv-app/zap-generated}/callback-stub.cpp | 0 .../tv-app/zap-generated}/endpoint_config.h | 0 .../tv-app/zap-generated}/gen_config.h | 0 .../tv-app/zap-generated}/gen_tokens.h | 0 .../zap-generated}/CHIPClientCallbacks.cpp | 0 .../zap-generated}/CHIPClientCallbacks.h | 0 .../zap-generated}/CHIPClusters.cpp | 0 .../window-app/zap-generated}/CHIPClusters.h | 0 .../IMClusterCommandHandler.cpp | 0 .../window-app/zap-generated}/af-gen-event.h | 0 .../zap-generated}/attribute-size.cpp | 0 .../zap-generated}/callback-stub.cpp | 0 .../zap-generated}/endpoint_config.h | 0 .../window-app/zap-generated}/gen_config.h | 0 .../window-app/zap-generated}/gen_tokens.h | 0 200 files changed, 171 insertions(+), 119 deletions(-) rename src/controller/data_model/{gen => zap-generated}/CHIPClientCallbacks.cpp (99%) rename src/controller/data_model/{gen => zap-generated}/CHIPClientCallbacks.h (100%) rename src/controller/data_model/{gen => zap-generated}/CHIPClusters.cpp (99%) rename src/controller/data_model/{gen => zap-generated}/CHIPClusters.h (100%) rename src/controller/data_model/{gen => zap-generated}/IMClusterCommandHandler.cpp (100%) rename src/controller/data_model/{gen => zap-generated}/af-gen-event.h (100%) rename src/controller/data_model/{gen => zap-generated}/attribute-size.cpp (100%) rename src/controller/data_model/{gen => zap-generated}/callback-stub.cpp (100%) rename src/controller/data_model/{gen => zap-generated}/endpoint_config.h (100%) rename src/controller/data_model/{gen => zap-generated}/gen_config.h (100%) rename {examples/all-clusters-app/all-clusters-common/gen => src/controller/data_model/zap-generated}/gen_tokens.h (100%) rename src/controller/java/{gen => zap-generated}/CHIPClusters-JNI.cpp (99%) rename src/controller/java/{gen => zap-generated}/ChipClusters.java (100%) rename src/darwin/Framework/CHIP/{gen => zap-generated}/CHIPClustersObjc.h (100%) rename src/darwin/Framework/CHIP/{gen => zap-generated}/CHIPClustersObjc.mm (99%) create mode 100644 zzz_generated/README.md rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/CHIPClusters.h (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/af-gen-event.h (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/attribute-size.cpp (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/callback-stub.cpp (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/endpoint_config.h (100%) rename {examples/all-clusters-app/all-clusters-common/gen => zzz_generated/all-clusters-app/zap-generated}/gen_config.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/all-clusters-app/zap-generated}/gen_tokens.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/CHIPClusters.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/af-gen-event.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/attribute-size.cpp (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/callback-stub.cpp (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/endpoint_config.h (100%) rename {examples/bridge-app/bridge-common/gen => zzz_generated/bridge-app/zap-generated}/gen_config.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/bridge-app/zap-generated}/gen_tokens.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/CHIPClusters.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/af-gen-event.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/attribute-size.cpp (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/callback-stub.cpp (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/endpoint_config.h (100%) rename {examples/lighting-app/lighting-common/gen => zzz_generated/lighting-app/zap-generated}/gen_config.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lighting-app/zap-generated}/gen_tokens.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/CHIPClusters.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/af-gen-event.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/attribute-size.cpp (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/callback-stub.cpp (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/endpoint_config.h (100%) rename {examples/lock-app/lock-common/gen => zzz_generated/lock-app/zap-generated}/gen_config.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/lock-app/zap-generated}/gen_tokens.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/CHIPClusters.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/af-gen-event.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/attribute-size.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/call-command-handler.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/call-command-handler.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/callback-stub.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/callback.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/chip-zcl-zpro-codec-api.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/encoder.cpp (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/endpoint_config.h (100%) rename {examples/ota-provider-app/ota-provider-common/gen => zzz_generated/ota-provider-app/zap-generated}/gen_config.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/ota-provider-app/zap-generated}/gen_tokens.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/CHIPClientCallbacks.cpp (99%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/CHIPClusters.cpp (99%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/CHIPClusters.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/af-gen-event.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/attribute-size.cpp (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/callback-stub.cpp (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/endpoint_config.h (100%) rename {examples/pump-app/pump-common/gen => zzz_generated/pump-app/zap-generated}/gen_config.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-app/zap-generated}/gen_tokens.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/CHIPClientCallbacks.cpp (99%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/CHIPClusters.cpp (99%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/CHIPClusters.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/af-gen-event.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/attribute-size.cpp (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/callback-stub.cpp (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/endpoint_config.h (100%) rename {examples/pump-controller-app/pump-controller-common/gen => zzz_generated/pump-controller-app/zap-generated}/gen_config.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/pump-controller-app/zap-generated}/gen_tokens.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/CHIPClusters.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/af-gen-event.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/attribute-size.cpp (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/callback-stub.cpp (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/endpoint_config.h (100%) rename {examples/temperature-measurement-app/esp32/main/gen => zzz_generated/temperature-measurement-app/zap-generated}/gen_config.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/temperature-measurement-app/zap-generated}/gen_tokens.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/CHIPClusters.cpp (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/CHIPClusters.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/af-gen-event.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/attribute-size.cpp (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/callback-stub.cpp (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/endpoint_config.h (100%) rename {examples/thermostat/thermostat-common/gen => zzz_generated/thermostat/zap-generated}/gen_config.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/thermostat/zap-generated}/gen_tokens.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/CHIPClusters.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/af-gen-event.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/attribute-size.cpp (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/callback-stub.cpp (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/endpoint_config.h (100%) rename {examples/tv-app/tv-common/gen => zzz_generated/tv-app/zap-generated}/gen_config.h (100%) rename {examples/window-app/common/gen => zzz_generated/tv-app/zap-generated}/gen_tokens.h (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/CHIPClientCallbacks.cpp (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/CHIPClientCallbacks.h (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/CHIPClusters.cpp (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/CHIPClusters.h (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/IMClusterCommandHandler.cpp (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/af-gen-event.h (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/attribute-size.cpp (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/callback-stub.cpp (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/endpoint_config.h (100%) rename {examples/window-app/common/gen => zzz_generated/window-app/zap-generated}/gen_config.h (100%) rename {src/controller/data_model/gen => zzz_generated/window-app/zap-generated}/gen_tokens.h (100%) diff --git a/docs/Doxyfile b/docs/Doxyfile index 94fa95a64b13a4..03b810c77e9f68 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -938,7 +938,8 @@ EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = NetworkProvisioningServer* \ */tests/* \ */dbus/* \ - */gen/* + */gen/* \ + */zap-generated/* # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn index ced567e5c18f81..0210fcedb2c646 100644 --- a/examples/all-clusters-app/all-clusters-common/BUILD.gn +++ b/examples/all-clusters-app/all-clusters-common/BUILD.gn @@ -19,6 +19,7 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("all-clusters-common") { zap_file = "all-clusters-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = + "${chip_root}/zzz_generated/all-clusters-app/zap-generated" is_server = true } diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 8dad647318553c..4558da1d0e48a1 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -18,6 +18,7 @@ # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) # The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/component.mk set(PRIV_INCLUDE_DIRS_LIST + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-app" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include" @@ -26,7 +27,7 @@ set(PRIV_INCLUDE_DIRS_LIST ) set(SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/gen" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-app/zap-generated" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/common/gen/attributes" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" diff --git a/examples/bridge-app/bridge-common/BUILD.gn b/examples/bridge-app/bridge-common/BUILD.gn index c9935173b44a29..ac3aa414ae3791 100644 --- a/examples/bridge-app/bridge-common/BUILD.gn +++ b/examples/bridge-app/bridge-common/BUILD.gn @@ -19,7 +19,7 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("bridge-common") { zap_file = "bridge-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/bridge-app/zap-generated" is_server = true # TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home! diff --git a/examples/bridge-app/esp32/main/CMakeLists.txt b/examples/bridge-app/esp32/main/CMakeLists.txt index d22554e2c96186..04a3f6cb6a2949 100644 --- a/examples/bridge-app/esp32/main/CMakeLists.txt +++ b/examples/bridge-app/esp32/main/CMakeLists.txt @@ -17,11 +17,12 @@ idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/bridge-app/bridge-common" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/bridge-app" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32" "${CMAKE_CURRENT_LIST_DIR}/include" SRC_DIRS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/bridge-app/bridge-common/gen" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/bridge-app/zap-generated" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/common/gen/attributes" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" @@ -39,4 +40,3 @@ idf_component_register(PRIV_INCLUDE_DIRS set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H") - diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h index ae23e6bca507f1..fd99f03651842c 100644 --- a/examples/bridge-app/linux/include/Device.h +++ b/examples/bridge-app/linux/include/Device.h @@ -18,8 +18,8 @@ #pragma once -//#include "gen/attribute-id.h" -//#include "gen/cluster-id.h" +//#include +//#include //#include //#include //#include diff --git a/examples/chip-tool-darwin/main.m b/examples/chip-tool-darwin/main.m index 18b028b5d6deba..19b9ccb6f2807b 100644 --- a/examples/chip-tool-darwin/main.m +++ b/examples/chip-tool-darwin/main.m @@ -23,7 +23,7 @@ #import #import #import -#import +#import #import int main(int argc, const char * argv[]) { return EXIT_SUCCESS; } diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h index 4e8a264ea406bb..59ca43d6ba05e8 100644 --- a/examples/chip-tool/commands/clusters/Commands.h +++ b/examples/chip-tool/commands/clusters/Commands.h @@ -22,10 +22,10 @@ #include #include "ModelCommand.h" -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" #include #include +#include +#include static void OnDefaultSuccessResponse(void * context) { diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index dc9edebc1229b3..42cedd1c4da9fc 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -20,8 +20,8 @@ #include "../../config/PersistentStorage.h" #include "../common/Command.h" -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include #include #include diff --git a/examples/chip-tool/commands/reporting/ReportingCommand.cpp b/examples/chip-tool/commands/reporting/ReportingCommand.cpp index e6691565996700..440335d044162a 100644 --- a/examples/chip-tool/commands/reporting/ReportingCommand.cpp +++ b/examples/chip-tool/commands/reporting/ReportingCommand.cpp @@ -19,8 +19,8 @@ #include "ReportingCommand.h" #include "../common/Commands.h" -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include using namespace ::chip; diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt index 0b97e499c62864..3bc97ce2b9089d 100644 --- a/examples/chip-tool/templates/commands.zapt +++ b/examples/chip-tool/templates/commands.zapt @@ -5,8 +5,8 @@ #include #include "ModelCommand.h" -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include #include #include diff --git a/examples/lighting-app/lighting-common/BUILD.gn b/examples/lighting-app/lighting-common/BUILD.gn index 4346081585b73d..2bfb6e877d6f71 100644 --- a/examples/lighting-app/lighting-common/BUILD.gn +++ b/examples/lighting-app/lighting-common/BUILD.gn @@ -30,6 +30,6 @@ if (chip_enable_pw_rpc) { chip_data_model("lighting-common") { zap_file = "lighting-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated" is_server = true } diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt index a915939a383482..0ba4fafa0e2549 100644 --- a/examples/lighting-app/mbed/CMakeLists.txt +++ b/examples/lighting-app/mbed/CMakeLists.txt @@ -6,7 +6,8 @@ cmake_minimum_required(VERSION 3.19.0) get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH) get_filename_component(APP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/.. REALPATH) get_filename_component(MBED_COMMON ${CHIP_ROOT}/examples/platform/mbed REALPATH) -get_filename_component(LIGHTING_COMMON ${CHIP_ROOT}/examples/lighting-app/lighting-common REALPATH) +get_filename_component(LIGHTING_GEN_DIR ${CHIP_ROOT}/zzz_generated/lighting-app/ REALPATH) +set(LIGHTING_GEN_SRC ${LIGHTING_GEN_DIR}/zap-generated/) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.in @@ -34,6 +35,7 @@ target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/main/include/ ${APP_ROOT}/lighting-common ${MBED_COMMON}/util/include + ${LIGHTING_GEN_DIR} ${CHIP_ROOT}/src/app ${CHIP_ROOT}/third_party/nlio/repo/include ) @@ -43,9 +45,9 @@ target_sources(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/main/LightingManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main/ZclCallbacks.cpp - ${LIGHTING_COMMON}/gen/attribute-size.cpp - ${APP_ROOT}/lighting-common/gen/callback-stub.cpp - ${LIGHTING_COMMON}/gen/IMClusterCommandHandler.cpp + ${LIGHTING_GEN_SRC}/attribute-size.cpp + ${LIGHTING_GEN_SRC}/callback-stub.cpp + ${LIGHTING_GEN_SRC}/IMClusterCommandHandler.cpp ${MBED_COMMON}/util/LEDWidget.cpp ${CHIP_ROOT}/src/app/common/gen/attributes/Accessors.cpp ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index 787eb67199ba51..28ec79bbd6961e 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -19,6 +19,8 @@ get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connect get_filename_component(NLIO_ROOT ${CHIP_ROOT}/third_party/nlio/repo/include REALPATH) get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH) get_filename_component(LIGHTING_COMMON ${CHIP_ROOT}/examples/lighting-app/lighting-common REALPATH) +get_filename_component(LIGHTING_GEN_DIR ${CHIP_ROOT}/zzz_generated/lighting-app/ REALPATH) +set(LIGHTING_GEN_SRC ${LIGHTING_GEN_DIR}/zap-generated/) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) @@ -52,6 +54,7 @@ target_compile_options(app PRIVATE -Werror) target_include_directories(app PRIVATE main/include ${LIGHTING_COMMON} + ${LIGHTING_GEN_DIR} ${NLIO_ROOT} ${NRFCONNECT_COMMON}/util/include ${NRFCONNECT_COMMON}/app/include) @@ -61,9 +64,9 @@ target_sources(app PRIVATE main/LightingManager.cpp main/main.cpp main/ZclCallbacks.cpp - ${LIGHTING_COMMON}/gen/attribute-size.cpp - ${LIGHTING_COMMON}/gen/callback-stub.cpp - ${LIGHTING_COMMON}/gen/IMClusterCommandHandler.cpp + ${LIGHTING_GEN_SRC}/attribute-size.cpp + ${LIGHTING_GEN_SRC}/callback-stub.cpp + ${LIGHTING_GEN_SRC}/IMClusterCommandHandler.cpp ${NRFCONNECT_COMMON}/util/LEDWidget.cpp ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp ${CHIP_ROOT}/src/app/common/gen/attributes/Accessors.cpp diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt index 6fb81995dc8317..904fde2c939b6e 100644 --- a/examples/lighting-app/telink/CMakeLists.txt +++ b/examples/lighting-app/telink/CMakeLists.txt @@ -18,7 +18,8 @@ cmake_minimum_required(VERSION 3.13.1) get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH) get_filename_component(NLIO_ROOT ${CHIP_ROOT}/third_party/nlio/repo/include REALPATH) get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH) -get_filename_component(LIGHTING_COMMON ${CHIP_ROOT}/examples/lighting-app/lighting-common REALPATH) +get_filename_component(LIGHTING_GEN_DIR ${CHIP_ROOT}/zzz_generated/lighting-app/ REALPATH) +set(LIGHTING_GEN_SRC ${LIGHTING_GEN_DIR}/zap-generated/) set(CONF_FILE ${CHIP_ROOT}/config/telink/app/zephyr.conf prj.conf) @@ -34,7 +35,7 @@ target_compile_options(app PRIVATE -fpermissive) target_include_directories(app PRIVATE include - ${LIGHTING_COMMON} + ${LIGHTING_GEN_DIR} ${NLIO_ROOT} ${TELINK_COMMON}/util/include ${TELINK_COMMON}/app/include) @@ -44,9 +45,9 @@ target_sources(app PRIVATE src/LightingManager.cpp src/main.cpp src/ZclCallbacks.cpp - ${LIGHTING_COMMON}/gen/attribute-size.cpp - ${LIGHTING_COMMON}/gen/callback-stub.cpp - ${LIGHTING_COMMON}/gen/IMClusterCommandHandler.cpp + ${LIGHTING_GEN_SRC}/attribute-size.cpp + ${LIGHTING_GEN_SRC}/callback-stub.cpp + ${LIGHTING_GEN_SRC}/IMClusterCommandHandler.cpp ${TELINK_COMMON}/util/src/LEDWidget.cpp ${TELINK_COMMON}/util/src/ButtonManager.cpp ${TELINK_COMMON}/util/src/ThreadUtil.cpp diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt index 6be6b85e43d04d..baeaf718dab23c 100644 --- a/examples/lock-app/esp32/main/CMakeLists.txt +++ b/examples/lock-app/esp32/main/CMakeLists.txt @@ -23,9 +23,9 @@ idf_component_register(INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/../../platform/esp32" "${CMAKE_SOURCE_DIR}/../../common/pigweed" "${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32" - "${CMAKE_SOURCE_DIR}/../../../src/lib/support" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lock-app/lock-common" "${CMAKE_CURRENT_LIST_DIR}/include" "${IDF_PATH}/components/freertos/include/freertos" SRC_DIRS @@ -33,7 +33,7 @@ idf_component_register(INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/../../platform/esp32" "${CMAKE_SOURCE_DIR}/../../common/pigweed" "${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lock-app/lock-common/gen" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/zap-generated" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/common/gen/attributes" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" @@ -114,12 +114,12 @@ target_include_directories(${chip_lib} PUBLIC else (CONFIG_ENABLE_PW_RPC) idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lock-app/lock-common" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32" "${CMAKE_CURRENT_LIST_DIR}/include" SRC_DIRS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lock-app/lock-common/gen" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/zap-generated" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/common/gen/attributes" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" diff --git a/examples/lock-app/lock-common/BUILD.gn b/examples/lock-app/lock-common/BUILD.gn index 030bdc69326695..916b579ab1a450 100644 --- a/examples/lock-app/lock-common/BUILD.gn +++ b/examples/lock-app/lock-common/BUILD.gn @@ -29,6 +29,6 @@ if (chip_enable_pw_rpc) { chip_data_model("lock-common") { zap_file = "lock-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/zap-generated" is_server = true } diff --git a/examples/lock-app/mbed/CMakeLists.txt b/examples/lock-app/mbed/CMakeLists.txt index e66cddabc117b1..3086323f59143b 100644 --- a/examples/lock-app/mbed/CMakeLists.txt +++ b/examples/lock-app/mbed/CMakeLists.txt @@ -6,7 +6,8 @@ cmake_minimum_required(VERSION 3.19.0) get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH) get_filename_component(APP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/.. REALPATH) get_filename_component(MBED_COMMON ${CHIP_ROOT}/examples/platform/mbed REALPATH) -get_filename_component(LOCK_COMMON ${CHIP_ROOT}/examples/lock-app/lock-common REALPATH) +get_filename_component(LOCK_GEN_DIR ${CHIP_ROOT}/zzz_generated/lock-app/ REALPATH) +set(LOCK_GEN_SRC ${LOCK_GEN_DIR}/zap-generated/) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.in @@ -32,10 +33,10 @@ add_executable(${APP_TARGET}) target_include_directories(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/main/include/ - ${APP_ROOT}/lock-common ${MBED_COMMON}/util/include ${CHIP_ROOT}/src/app ${CHIP_ROOT}/third_party/nlio/repo/include + ${LOCK_GEN_DIR} ) target_sources(${APP_TARGET} PRIVATE @@ -43,9 +44,9 @@ target_sources(${APP_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/main/BoltLockManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main/ZclCallbacks.cpp - ${LOCK_COMMON}/gen/attribute-size.cpp - ${APP_ROOT}/lock-common/gen/callback-stub.cpp - ${LOCK_COMMON}/gen/IMClusterCommandHandler.cpp + ${LOCK_GEN_SRC}/attribute-size.cpp + ${LOCK_GEN_SRC}/callback-stub.cpp + ${LOCK_GEN_SRC}/IMClusterCommandHandler.cpp ${MBED_COMMON}/util/LEDWidget.cpp ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp ${CHIP_ROOT}/src/app/common/gen/attributes/Accessors.cpp diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt index c3b8e7fc726537..7b15eaf783190f 100644 --- a/examples/lock-app/nrfconnect/CMakeLists.txt +++ b/examples/lock-app/nrfconnect/CMakeLists.txt @@ -18,7 +18,8 @@ cmake_minimum_required(VERSION 3.13.1) get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH) get_filename_component(NLIO_ROOT ${CHIP_ROOT}/third_party/nlio/repo/include REALPATH) get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH) -get_filename_component(LOCK_COMMON ${CHIP_ROOT}/examples/lock-app/lock-common REALPATH) +get_filename_component(LOCK_GEN_DIR ${CHIP_ROOT}/zzz_generated/lock-app/ REALPATH) +set(LOCK_GEN_SRC ${LOCK_GEN_DIR}/zap-generated/) include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake) @@ -51,7 +52,7 @@ include(${CHIP_ROOT}/config/nrfconnect/app/enable-gnu-std.cmake) target_include_directories(app PRIVATE main/include - ${LOCK_COMMON} + ${LOCK_GEN_DIR} ${NLIO_ROOT} ${NRFCONNECT_COMMON}/util/include ${NRFCONNECT_COMMON}/app/include) @@ -61,9 +62,9 @@ target_sources(app PRIVATE main/BoltLockManager.cpp main/main.cpp main/ZclCallbacks.cpp - ${LOCK_COMMON}/gen/attribute-size.cpp - ${LOCK_COMMON}/gen/callback-stub.cpp - ${LOCK_COMMON}/gen/IMClusterCommandHandler.cpp + ${LOCK_GEN_SRC}/attribute-size.cpp + ${LOCK_GEN_SRC}/callback-stub.cpp + ${LOCK_GEN_SRC}/IMClusterCommandHandler.cpp ${NRFCONNECT_COMMON}/util/LEDWidget.cpp ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp diff --git a/examples/ota-provider-app/linux/main.cpp b/examples/ota-provider-app/linux/main.cpp index 1cdd51e63e3686..09fedad56663c4 100644 --- a/examples/ota-provider-app/linux/main.cpp +++ b/examples/ota-provider-app/linux/main.cpp @@ -29,8 +29,8 @@ #include #include -#include "BdxOtaSender.h" -#include "OTAProviderExample.h" +#include +#include #include #include diff --git a/examples/ota-provider-app/ota-provider-common/BUILD.gn b/examples/ota-provider-app/ota-provider-common/BUILD.gn index 18d23f11a2170c..63c5f2d1de5083 100644 --- a/examples/ota-provider-app/ota-provider-common/BUILD.gn +++ b/examples/ota-provider-app/ota-provider-common/BUILD.gn @@ -16,17 +16,26 @@ import("//build_overrides/chip.gni") import("${chip_root}/src/app/chip_data_model.gni") +config("config") { + include_dirs = [ ".." ] +} + chip_data_model("ota-provider-common") { zap_file = "ota-provider-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = + "${chip_root}/zzz_generated/ota-provider-app/zap-generated" sources = [ "BdxOtaSender.cpp", + "BdxOtaSender.h", "OTAProviderExample.cpp", + "OTAProviderExample.h", ] deps = [ "${chip_root}/src/protocols/bdx" ] is_server = true + + public_configs = [ ":config" ] } diff --git a/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp b/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp index 9f88652848f08e..c45ff774972fb0 100644 --- a/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp +++ b/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "BdxOtaSender.h" +#include #include #include diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp index 365c5c6e43e6f2..d8b3b048612ff6 100644 --- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp +++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "OTAProviderExample.h" +#include #include #include diff --git a/examples/pump-app/pump-common/BUILD.gn b/examples/pump-app/pump-common/BUILD.gn index c0397f08ccc27c..58508f60af8adb 100644 --- a/examples/pump-app/pump-common/BUILD.gn +++ b/examples/pump-app/pump-common/BUILD.gn @@ -19,6 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("pump-common") { zap_file = "pump-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated" is_server = true } diff --git a/examples/pump-controller-app/pump-controller-common/BUILD.gn b/examples/pump-controller-app/pump-controller-common/BUILD.gn index cfd1a2aab55ce0..e62de422b08097 100644 --- a/examples/pump-controller-app/pump-controller-common/BUILD.gn +++ b/examples/pump-controller-app/pump-controller-common/BUILD.gn @@ -19,6 +19,7 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("pump-controller-common") { zap_file = "pump-controller-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = + "${chip_root}/zzz_generated/pump-controller-app/zap-generated" is_server = true } diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt index 6438df9827de12..6f64d33bb190a6 100644 --- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt @@ -20,10 +20,11 @@ idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/temperature-measurement-app/" "${CMAKE_CURRENT_LIST_DIR}/include" SRC_DIRS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_CURRENT_LIST_DIR}/gen" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/temperature-measurement-app/zap-generated" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/common/gen/attributes" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" diff --git a/examples/thermostat/thermostat-common/BUILD.gn b/examples/thermostat/thermostat-common/BUILD.gn index 1503d61fe6e005..7f35acfdf371ad 100644 --- a/examples/thermostat/thermostat-common/BUILD.gn +++ b/examples/thermostat/thermostat-common/BUILD.gn @@ -19,6 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("thermostat-common") { zap_file = "thermostat.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/thermostat/zap-generated" is_server = true } diff --git a/examples/tv-app/tv-common/BUILD.gn b/examples/tv-app/tv-common/BUILD.gn index f5b472c091b9c8..f723e6f0db12f1 100644 --- a/examples/tv-app/tv-common/BUILD.gn +++ b/examples/tv-app/tv-common/BUILD.gn @@ -19,6 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("tv-common") { zap_file = "tv-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated" is_server = true } diff --git a/examples/window-app/common/BUILD.gn b/examples/window-app/common/BUILD.gn index a481ae68d5e804..42941ee10d38d5 100644 --- a/examples/window-app/common/BUILD.gn +++ b/examples/window-app/common/BUILD.gn @@ -19,6 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("window-common") { zap_file = "window-app.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "${chip_root}/zzz_generated/window-app/zap-generated" is_server = true } diff --git a/scripts/tools/zap/generate.py b/scripts/tools/zap/generate.py index cdf4c48f01fcc9..160a74872ed35a 100755 --- a/scripts/tools/zap/generate.py +++ b/scripts/tools/zap/generate.py @@ -61,7 +61,7 @@ def getDirPath(name): def runArgumentsParser(): default_templates = 'src/app/zap-templates/app-templates.json' default_zcl = 'src/app/zap-templates/zcl/zcl.json' - default_output_dir = 'gen/' + default_output_dir = 'zap-generated/' parser = argparse.ArgumentParser( description='Generate artifacts from .zapt templates') @@ -70,13 +70,17 @@ def runArgumentsParser(): help='Path to the .zapt templates records to use for generating artifacts (default: "' + default_templates + '")') parser.add_argument('-z', '--zcl', default=default_zcl, help='Path to the zcl templates records to use for generating artifacts (default: "' + default_zcl + '")') + parser.add_argument('-o', '--output-dir', default=None, + help='Output directory for the generated files (default: automatically selected)') args = parser.parse_args() # By default, this script assumes that the global CHIP template is used with - # a default 'gen/' output folder relative to APP_ROOT_DIR. + # a default 'zap-generated/' output folder relative to APP_ROOT_DIR. # If needed, the user may specify a specific template as a second argument. In # this case the output folder is relative to CHIP_ROOT_DIR. - if args.templates == default_templates: + if args.output_dir: + output_dir = args.output_dir + elif args.templates == default_templates: output_dir = os.path.join(Path(args.zap).parent, default_output_dir) else: output_dir = '' diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py index d5caf2f678309a..8f7fba1ad70477 100755 --- a/scripts/tools/zap_regen_all.py +++ b/scripts/tools/zap_regen_all.py @@ -19,6 +19,7 @@ from pathlib import Path import sys import subprocess +import logging CHIP_ROOT_DIR = os.path.realpath( os.path.join(os.path.dirname(__file__), '../..')) @@ -33,8 +34,24 @@ def checkPythonVersion(): def getGlobalTemplatesTargets(): targets = [] - targets.extend([[str(filepath)] - for filepath in Path('./examples').rglob('*.zap')]) + + for filepath in Path('./examples').rglob('*.zap'): + example_name = filepath.as_posix() + example_name = example_name[example_name.index('examples/') + 9:] + example_name = example_name[:example_name.index('/')] + + logging.info("Found example %s (via %s)" % + (example_name, str(filepath))) + + # The name zap-generated is to make includes clear by using + # a name like + output_dir = os.path.join( + 'zzz_generated', example_name, 'zap-generated') + if not os.path.exists(output_dir): + os.makedirs(output_dir) + + targets.append([str(filepath), '-o', output_dir]) + targets.extend([[str(filepath)] for filepath in Path('./src/darwin').rglob('*.zap')]) targets.extend([[str(filepath)] for filepath in Path( @@ -65,6 +82,10 @@ def getTargets(): def main(): + logging.basicConfig( + level=logging.INFO, + format='%(asctime)s %(name)s %(levelname)-7s %(message)s' + ) checkPythonVersion() os.chdir(CHIP_ROOT_DIR) diff --git a/src/app/clusters/scenes-client/scenes-client.cpp b/src/app/clusters/scenes-client/scenes-client.cpp index 61d09794fa361a..8a59aa0593c4ea 100644 --- a/src/app/clusters/scenes-client/scenes-client.cpp +++ b/src/app/clusters/scenes-client/scenes-client.cpp @@ -42,7 +42,7 @@ #include #include -#include "gen/command-id.h" +#include using namespace chip; diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp index b83ce8bb41494f..50a16045fac804 100644 --- a/src/app/util/DataModelHandler.cpp +++ b/src/app/util/DataModelHandler.cpp @@ -22,7 +22,7 @@ #include -#if __has_include("gen/endpoint_config.h") +#if __has_include() #define USE_ZAP_CONFIG 1 #include #include diff --git a/src/app/util/af-event.cpp b/src/app/util/af-event.cpp index 04c31acb508263..f6d402aba0b904 100644 --- a/src/app/util/af-event.cpp +++ b/src/app/util/af-event.cpp @@ -51,7 +51,7 @@ #include -#include "gen/af-gen-event.h" +#include using namespace chip; diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 7c8b8f01045732..d112922e6f0d15 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -58,7 +58,7 @@ // we use the provider sample. #ifndef ATTRIBUTE_STORAGE_CONFIGURATION // #error "Must define ATTRIBUTE_STORAGE_CONFIGURATION to specify the App. Builder default attributes file." -#include "gen/endpoint_config.h" +#include #else #include ATTRIBUTE_STORAGE_CONFIGURATION #endif diff --git a/src/app/util/binding-table.cpp b/src/app/util/binding-table.cpp index d798c2c3b04cdd..82ba401c3dd9c8 100644 --- a/src/app/util/binding-table.cpp +++ b/src/app/util/binding-table.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include static EmberBindingTableEntry bindingTable[EMBER_BINDING_TABLE_SIZE]; diff --git a/src/app/util/config.h b/src/app/util/config.h index b48d151d401a72..beea46c84a99ad 100644 --- a/src/app/util/config.h +++ b/src/app/util/config.h @@ -74,16 +74,16 @@ #ifdef ZA_GENERATED_HEADER #include ZA_GENERATED_HEADER #else -#include "gen/gen_config.h" +#include #endif #ifdef ATTRIBUTE_STORAGE_CONFIGURATION #include ATTRIBUTE_STORAGE_CONFIGURATION #else -#include "gen/endpoint_config.h" +#include #endif -#include "gen/gen_tokens.h" // For GENERATED_TOKEN_LOADER/SAVER macros +#include // For GENERATED_TOKEN_LOADER/SAVER macros // ******************************************************************* // pre-defined Devices diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index 72e071d4116e4a..3733b3968eaa9a 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include using namespace chip; using namespace chip::app; diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h index 37382566ff6684..f52d157e582fdc 100644 --- a/src/app/util/types_stub.h +++ b/src/app/util/types_stub.h @@ -50,8 +50,8 @@ #include static_assert(sizeof(chip::NodeId) == sizeof(uint64_t), "Unexpected node if size"); -#include "gen/endpoint_config.h" -#include "gen/gen_config.h" +#include +#include /** * @brief Defines binding types. diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt index 0ca19f965954b9..0d75e7368d00e1 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt @@ -1,7 +1,7 @@ {{> header}} {{#if (chip_has_client_clusters)}} -#include "gen/CHIPClientCallbacks.h" +#include #include diff --git a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt index be9824fccac08e..c3e1f82a1d7c15 100644 --- a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt +++ b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/controller/CHIPDevice.cpp b/src/controller/CHIPDevice.cpp index d676c5f2dbed70..c414729574f56d 100644 --- a/src/controller/CHIPDevice.cpp +++ b/src/controller/CHIPDevice.cpp @@ -26,7 +26,7 @@ #include -#include +#include #if CONFIG_DEVICE_LAYER #include diff --git a/src/controller/CHIPDevice.h b/src/controller/CHIPDevice.h index f9bb8b4635a744..7fe69dccb4a626 100644 --- a/src/controller/CHIPDevice.h +++ b/src/controller/CHIPDevice.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 968fc075d8aa50..543c554234e021 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #if CONFIG_DEVICE_LAYER #include diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 7e699b05be6de1..556dd21a9f739c 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn index d74fd7b10911bb..74e0e4ea00aad7 100644 --- a/src/controller/data_model/BUILD.gn +++ b/src/controller/data_model/BUILD.gn @@ -19,7 +19,7 @@ import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("data_model") { zap_file = "controller-clusters.zap" - zap_pregenerated_dir = "gen" + zap_pregenerated_dir = "zap-generated" use_default_client_callbacks = true allow_circular_includes_from = [ "${chip_root}/src/controller" ] diff --git a/src/controller/data_model/gen/CHIPClientCallbacks.cpp b/src/controller/data_model/zap-generated/CHIPClientCallbacks.cpp similarity index 99% rename from src/controller/data_model/gen/CHIPClientCallbacks.cpp rename to src/controller/data_model/zap-generated/CHIPClientCallbacks.cpp index 27c3104a47cbd2..7f2c40ade7e88e 100644 --- a/src/controller/data_model/gen/CHIPClientCallbacks.cpp +++ b/src/controller/data_model/zap-generated/CHIPClientCallbacks.cpp @@ -17,7 +17,7 @@ // THIS FILE IS GENERATED BY ZAP -#include "gen/CHIPClientCallbacks.h" +#include #include diff --git a/src/controller/data_model/gen/CHIPClientCallbacks.h b/src/controller/data_model/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from src/controller/data_model/gen/CHIPClientCallbacks.h rename to src/controller/data_model/zap-generated/CHIPClientCallbacks.h diff --git a/src/controller/data_model/gen/CHIPClusters.cpp b/src/controller/data_model/zap-generated/CHIPClusters.cpp similarity index 99% rename from src/controller/data_model/gen/CHIPClusters.cpp rename to src/controller/data_model/zap-generated/CHIPClusters.cpp index 34723bdef08685..bc7877dfa25284 100644 --- a/src/controller/data_model/gen/CHIPClusters.cpp +++ b/src/controller/data_model/zap-generated/CHIPClusters.cpp @@ -31,9 +31,9 @@ #include #include -#include #include #include +#include #define COMMAND_HEADER(name, clusterId) \ const char * kName = name; \ diff --git a/src/controller/data_model/gen/CHIPClusters.h b/src/controller/data_model/zap-generated/CHIPClusters.h similarity index 100% rename from src/controller/data_model/gen/CHIPClusters.h rename to src/controller/data_model/zap-generated/CHIPClusters.h diff --git a/src/controller/data_model/gen/IMClusterCommandHandler.cpp b/src/controller/data_model/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from src/controller/data_model/gen/IMClusterCommandHandler.cpp rename to src/controller/data_model/zap-generated/IMClusterCommandHandler.cpp diff --git a/src/controller/data_model/gen/af-gen-event.h b/src/controller/data_model/zap-generated/af-gen-event.h similarity index 100% rename from src/controller/data_model/gen/af-gen-event.h rename to src/controller/data_model/zap-generated/af-gen-event.h diff --git a/src/controller/data_model/gen/attribute-size.cpp b/src/controller/data_model/zap-generated/attribute-size.cpp similarity index 100% rename from src/controller/data_model/gen/attribute-size.cpp rename to src/controller/data_model/zap-generated/attribute-size.cpp diff --git a/src/controller/data_model/gen/callback-stub.cpp b/src/controller/data_model/zap-generated/callback-stub.cpp similarity index 100% rename from src/controller/data_model/gen/callback-stub.cpp rename to src/controller/data_model/zap-generated/callback-stub.cpp diff --git a/src/controller/data_model/gen/endpoint_config.h b/src/controller/data_model/zap-generated/endpoint_config.h similarity index 100% rename from src/controller/data_model/gen/endpoint_config.h rename to src/controller/data_model/zap-generated/endpoint_config.h diff --git a/src/controller/data_model/gen/gen_config.h b/src/controller/data_model/zap-generated/gen_config.h similarity index 100% rename from src/controller/data_model/gen/gen_config.h rename to src/controller/data_model/zap-generated/gen_config.h diff --git a/examples/all-clusters-app/all-clusters-common/gen/gen_tokens.h b/src/controller/data_model/zap-generated/gen_tokens.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/gen_tokens.h rename to src/controller/data_model/zap-generated/gen_tokens.h diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn index 425a6353535fe0..3d59be58188d3b 100644 --- a/src/controller/java/BUILD.gn +++ b/src/controller/java/BUILD.gn @@ -44,7 +44,7 @@ shared_library("jni") { "MdnsImpl.cpp", "MdnsImpl.h", "StackLock.h", - "gen/CHIPClusters-JNI.cpp", + "zap-generated/CHIPClusters-JNI.cpp", ] deps = [ @@ -66,7 +66,6 @@ android_library("java") { ] sources = [ - "gen/ChipClusters.java", "src/chip/devicecontroller/AndroidChipStack.java", "src/chip/devicecontroller/ChipClusterException.java", "src/chip/devicecontroller/ChipCommandType.java", @@ -79,6 +78,7 @@ android_library("java") { "src/chip/devicecontroller/mdns/ChipMdnsCallbackImpl.java", "src/chip/devicecontroller/mdns/NsdManagerServiceResolver.java", "src/chip/devicecontroller/mdns/ServiceResolver.java", + "zap-generated/ChipClusters.java", ] javac_flags = [ "-Xlint:deprecation" ] diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index 94fbb73dc8a9d8..ebc4ecd5082b8c 100644 --- a/src/controller/java/CHIPDeviceController-JNI.cpp +++ b/src/controller/java/CHIPDeviceController-JNI.cpp @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include // Choose an approximation of PTHREAD_NULL if pthread.h doesn't define one. #ifndef PTHREAD_NULL diff --git a/src/controller/java/templates/CHIPClusters-JNI.zapt b/src/controller/java/templates/CHIPClusters-JNI.zapt index 198436ae3bf7a4..8d1c797fae2ac7 100644 --- a/src/controller/java/templates/CHIPClusters-JNI.zapt +++ b/src/controller/java/templates/CHIPClusters-JNI.zapt @@ -1,8 +1,8 @@ {{> header}} {{#if (chip_has_client_clusters)}} -#include "gen/CHIPClusters.h" -#include "gen/CHIPClientCallbacks.h" +#include +#include #include #include diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json index 1db5aaaee6265e..98f46d698939f0 100644 --- a/src/controller/java/templates/templates.json +++ b/src/controller/java/templates/templates.json @@ -29,12 +29,12 @@ { "path": "CHIPClusters-JNI.zapt", "name": "CHIP ZCL API for Java (native code)", - "output": "src/controller/java/gen/CHIPClusters-JNI.cpp" + "output": "src/controller/java/zap-generated/CHIPClusters-JNI.cpp" }, { "path": "ChipClusters-java.zapt", "name": "CHIP ZCL API for Java", - "output": "src/controller/java/gen/ChipClusters.java" + "output": "src/controller/java/zap-generated/ChipClusters.java" } ] } diff --git a/src/controller/java/gen/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp similarity index 99% rename from src/controller/java/gen/CHIPClusters-JNI.cpp rename to src/controller/java/zap-generated/CHIPClusters-JNI.cpp index 5349c160cb0ac9..e45352b456622d 100644 --- a/src/controller/java/gen/CHIPClusters-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp @@ -17,8 +17,8 @@ // THIS FILE IS GENERATED BY ZAP -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include #include #include diff --git a/src/controller/java/gen/ChipClusters.java b/src/controller/java/zap-generated/ChipClusters.java similarity index 100% rename from src/controller/java/gen/ChipClusters.java rename to src/controller/java/zap-generated/ChipClusters.java diff --git a/src/controller/python/chip/clusters/CHIPClusters.cpp b/src/controller/python/chip/clusters/CHIPClusters.cpp index f5f83e7b275777..7167da539d0d16 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.cpp +++ b/src/controller/python/chip/clusters/CHIPClusters.cpp @@ -25,8 +25,8 @@ #include -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include using namespace chip; using namespace chip::app; diff --git a/src/controller/python/templates/python-CHIPClusters-cpp.zapt b/src/controller/python/templates/python-CHIPClusters-cpp.zapt index 297186a8f11b2d..1d5c9eeb2170da 100644 --- a/src/controller/python/templates/python-CHIPClusters-cpp.zapt +++ b/src/controller/python/templates/python-CHIPClusters-cpp.zapt @@ -8,8 +8,8 @@ #include -#include "gen/CHIPClientCallbacks.h" -#include "gen/CHIPClusters.h" +#include +#include using namespace chip; using namespace chip::app; diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h index b0e401f5c44804..cf8266d53d1e2a 100644 --- a/src/credentials/CHIPCert.h +++ b/src/credentials/CHIPCert.h @@ -668,7 +668,7 @@ CHIP_ERROR ExtractCertsFromCertArray(const ByteSpan & opCertArray, ByteSpan & no * @brief Convert CHIP certificate to the standard X.509 DER encoded certificate. * * @param chipCert CHIP certificate in CHIP TLV encoding. - * @param x509Cet Buffer to store converted certificate in X.509 DER format. + * @param x509Cert Buffer to store converted certificate in X.509 DER format. * * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise **/ diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj index 7329eee395367f..089110d7effa53 100644 --- a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj @@ -84,11 +84,11 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1E857305265519720050A4D9 /* CHIPClientCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClientCallbacks.cpp; path = ../../../controller/data_model/gen/CHIPClientCallbacks.cpp; sourceTree = ""; }; - 1E857307265519AE0050A4D9 /* callback-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "callback-stub.cpp"; path = "../../../controller/data_model/gen/callback-stub.cpp"; sourceTree = ""; }; - 1E857309265519AE0050A4D9 /* CHIPClusters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClusters.cpp; path = ../../../controller/data_model/gen/CHIPClusters.cpp; sourceTree = ""; }; - 1E85730A265519AE0050A4D9 /* attribute-size.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-size.cpp"; path = "../../../controller/data_model/gen/attribute-size.cpp"; sourceTree = ""; }; - 1E85730B265519AE0050A4D9 /* IMClusterCommandHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IMClusterCommandHandler.cpp; path = ../../../controller/data_model/gen/IMClusterCommandHandler.cpp; sourceTree = ""; }; + 1E857305265519720050A4D9 /* CHIPClientCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClientCallbacks.cpp; path = ../../../controller/data_model/zap-generated/CHIPClientCallbacks.cpp; sourceTree = ""; }; + 1E857307265519AE0050A4D9 /* callback-stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "callback-stub.cpp"; path = "../../../controller/data_model/zap-generated/callback-stub.cpp"; sourceTree = ""; }; + 1E857309265519AE0050A4D9 /* CHIPClusters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CHIPClusters.cpp; path = ../../../controller/data_model/zap-generated/CHIPClusters.cpp; sourceTree = ""; }; + 1E85730A265519AE0050A4D9 /* attribute-size.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-size.cpp"; path = "../../../controller/data_model/zap-generated/attribute-size.cpp"; sourceTree = ""; }; + 1E85730B265519AE0050A4D9 /* IMClusterCommandHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IMClusterCommandHandler.cpp; path = ../../../controller/data_model/zap-generated/IMClusterCommandHandler.cpp; sourceTree = ""; }; 1E85731226551A490050A4D9 /* binding-table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "binding-table.cpp"; path = "../../../app/util/binding-table.cpp"; sourceTree = ""; }; 1E85731326551A490050A4D9 /* process-global-message.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "process-global-message.cpp"; path = "../../../app/util/process-global-message.cpp"; sourceTree = ""; }; 1E85731426551A490050A4D9 /* attribute-list-byte-span.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "attribute-list-byte-span.cpp"; path = "../../../app/util/attribute-list-byte-span.cpp"; sourceTree = ""; }; @@ -108,8 +108,8 @@ 1E85733226551A700050A4D9 /* reporting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = reporting.cpp; path = ../../../app/reporting/reporting.cpp; sourceTree = ""; }; 1E85733326551A700050A4D9 /* reporting-default-configuration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "reporting-default-configuration.cpp"; path = "../../../app/reporting/reporting-default-configuration.cpp"; sourceTree = ""; }; 1EB41B7A263C4CC60048E4C1 /* CHIPClustersTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHIPClustersTests.m; sourceTree = ""; }; - 1EC4CE5925CC26E900D7304F /* CHIPClustersObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CHIPClustersObjc.mm; path = gen/CHIPClustersObjc.mm; sourceTree = ""; }; - 1EC4CE6325CC276600D7304F /* CHIPClustersObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CHIPClustersObjc.h; path = gen/CHIPClustersObjc.h; sourceTree = ""; }; + 1EC4CE5925CC26E900D7304F /* CHIPClustersObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CHIPClustersObjc.mm; path = zap-generated/CHIPClustersObjc.mm; sourceTree = ""; }; + 1EC4CE6325CC276600D7304F /* CHIPClustersObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CHIPClustersObjc.h; path = zap-generated/CHIPClustersObjc.h; sourceTree = ""; }; 2C1B02782641DB4E00780EF1 /* CHIPOperationalCredentialsDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CHIPOperationalCredentialsDelegate.mm; sourceTree = ""; }; 2C1B02792641DB4E00780EF1 /* CHIPOperationalCredentialsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHIPOperationalCredentialsDelegate.h; sourceTree = ""; }; 2C222ACE255C620600E446B9 /* CHIPDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHIPDevice.h; sourceTree = ""; }; diff --git a/src/darwin/Framework/CHIP/BUILD.gn b/src/darwin/Framework/CHIP/BUILD.gn index 381fd179878288..d0ebe853cc10a2 100644 --- a/src/darwin/Framework/CHIP/BUILD.gn +++ b/src/darwin/Framework/CHIP/BUILD.gn @@ -52,8 +52,8 @@ static_library("framework") { "CHIPQRCodeSetupPayloadParser.mm", "CHIPSetupPayload.h", "CHIPSetupPayload.mm", - "gen/CHIPClustersObjc.h", - "gen/CHIPClustersObjc.mm", + "zap-generated/CHIPClustersObjc.h", + "zap-generated/CHIPClustersObjc.mm", ] public_deps = [ diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm index 3c5809073ccb08..5dcc2b094c22d1 100644 --- a/src/darwin/Framework/CHIP/CHIPDeviceController.mm +++ b/src/darwin/Framework/CHIP/CHIPDeviceController.mm @@ -23,7 +23,7 @@ #import "CHIPOperationalCredentialsDelegate.h" #import "CHIPPersistentStorageDelegateBridge.h" #import "CHIPSetupPayload.h" -#import "gen/CHIPClustersObjc.h" +#import #import "CHIPDeviceConnectionBridge.h" diff --git a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt index 065a24a5c023f2..5d1b1b5bf28522 100644 --- a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt +++ b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc-src.zapt @@ -6,9 +6,9 @@ #import "CHIPDevice.h" #import "CHIPDevice_Internal.h" #import "CHIPError_Internal.h" -#import "gen/CHIPClusters.h" -#import "gen/CHIPClustersObjc.h" -#import "gen/CHIPClientCallbacks.h" +#import +#import +#import #import "app/util/af.h" #include diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json index 0487ebd656b0a9..d46660af762905 100644 --- a/src/darwin/Framework/CHIP/templates/templates.json +++ b/src/darwin/Framework/CHIP/templates/templates.json @@ -28,12 +28,12 @@ { "path": "CHIPClustersObjc.zapt", "name": "Objc ZCL API Header", - "output": "src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h" + "output": "src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h" }, { "path": "CHIPClustersObjc-src.zapt", "name": "Objc ZCL API", - "output": "src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm" + "output": "src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm" }, { "path": "clusters-tests.zapt", diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h similarity index 100% rename from src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h rename to src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm similarity index 99% rename from src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm rename to src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 06107fba5a8d4e..039b856f9031dd 100644 --- a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -23,9 +23,9 @@ #import "CHIPDevice_Internal.h" #import "CHIPError_Internal.h" #import "app/util/af.h" -#import "gen/CHIPClientCallbacks.h" -#import "gen/CHIPClusters.h" -#import "gen/CHIPClustersObjc.h" +#import +#import +#import #include #include diff --git a/zzz_generated/README.md b/zzz_generated/README.md new file mode 100644 index 00000000000000..5c4e3c3779e678 --- /dev/null +++ b/zzz_generated/README.md @@ -0,0 +1,5 @@ +### Generated files + +This folder contains generated zap source files. The unusual name (starting with +zzz) is to make alphabetical sorting show generated files at the end of file +diffs to make code review easier. diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/all-clusters-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/all-clusters-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h b/zzz_generated/all-clusters-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h rename to zzz_generated/all-clusters-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClusters.cpp b/zzz_generated/all-clusters-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/CHIPClusters.cpp rename to zzz_generated/all-clusters-app/zap-generated/CHIPClusters.cpp diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClusters.h b/zzz_generated/all-clusters-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/CHIPClusters.h rename to zzz_generated/all-clusters-app/zap-generated/CHIPClusters.h diff --git a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/all-clusters-app/all-clusters-common/gen/af-gen-event.h b/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/af-gen-event.h rename to zzz_generated/all-clusters-app/zap-generated/af-gen-event.h diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp b/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/attribute-size.cpp rename to zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp rename to zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp diff --git a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h rename to zzz_generated/all-clusters-app/zap-generated/endpoint_config.h diff --git a/examples/all-clusters-app/all-clusters-common/gen/gen_config.h b/zzz_generated/all-clusters-app/zap-generated/gen_config.h similarity index 100% rename from examples/all-clusters-app/all-clusters-common/gen/gen_config.h rename to zzz_generated/all-clusters-app/zap-generated/gen_config.h diff --git a/examples/bridge-app/bridge-common/gen/gen_tokens.h b/zzz_generated/all-clusters-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/gen_tokens.h rename to zzz_generated/all-clusters-app/zap-generated/gen_tokens.h diff --git a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h b/zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h rename to zzz_generated/bridge-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/bridge-app/bridge-common/gen/CHIPClusters.cpp b/zzz_generated/bridge-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/bridge-app/bridge-common/gen/CHIPClusters.cpp rename to zzz_generated/bridge-app/zap-generated/CHIPClusters.cpp diff --git a/examples/bridge-app/bridge-common/gen/CHIPClusters.h b/zzz_generated/bridge-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/CHIPClusters.h rename to zzz_generated/bridge-app/zap-generated/CHIPClusters.h diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/bridge-app/bridge-common/gen/af-gen-event.h b/zzz_generated/bridge-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/af-gen-event.h rename to zzz_generated/bridge-app/zap-generated/af-gen-event.h diff --git a/examples/bridge-app/bridge-common/gen/attribute-size.cpp b/zzz_generated/bridge-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/bridge-app/bridge-common/gen/attribute-size.cpp rename to zzz_generated/bridge-app/zap-generated/attribute-size.cpp diff --git a/examples/bridge-app/bridge-common/gen/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/bridge-app/bridge-common/gen/callback-stub.cpp rename to zzz_generated/bridge-app/zap-generated/callback-stub.cpp diff --git a/examples/bridge-app/bridge-common/gen/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/endpoint_config.h rename to zzz_generated/bridge-app/zap-generated/endpoint_config.h diff --git a/examples/bridge-app/bridge-common/gen/gen_config.h b/zzz_generated/bridge-app/zap-generated/gen_config.h similarity index 100% rename from examples/bridge-app/bridge-common/gen/gen_config.h rename to zzz_generated/bridge-app/zap-generated/gen_config.h diff --git a/examples/lighting-app/lighting-common/gen/gen_tokens.h b/zzz_generated/bridge-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/gen_tokens.h rename to zzz_generated/bridge-app/zap-generated/gen_tokens.h diff --git a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h b/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h rename to zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/lighting-app/lighting-common/gen/CHIPClusters.cpp b/zzz_generated/lighting-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/lighting-app/lighting-common/gen/CHIPClusters.cpp rename to zzz_generated/lighting-app/zap-generated/CHIPClusters.cpp diff --git a/examples/lighting-app/lighting-common/gen/CHIPClusters.h b/zzz_generated/lighting-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/CHIPClusters.h rename to zzz_generated/lighting-app/zap-generated/CHIPClusters.h diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/lighting-app/lighting-common/gen/af-gen-event.h b/zzz_generated/lighting-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/af-gen-event.h rename to zzz_generated/lighting-app/zap-generated/af-gen-event.h diff --git a/examples/lighting-app/lighting-common/gen/attribute-size.cpp b/zzz_generated/lighting-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/lighting-app/lighting-common/gen/attribute-size.cpp rename to zzz_generated/lighting-app/zap-generated/attribute-size.cpp diff --git a/examples/lighting-app/lighting-common/gen/callback-stub.cpp b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/lighting-app/lighting-common/gen/callback-stub.cpp rename to zzz_generated/lighting-app/zap-generated/callback-stub.cpp diff --git a/examples/lighting-app/lighting-common/gen/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/endpoint_config.h rename to zzz_generated/lighting-app/zap-generated/endpoint_config.h diff --git a/examples/lighting-app/lighting-common/gen/gen_config.h b/zzz_generated/lighting-app/zap-generated/gen_config.h similarity index 100% rename from examples/lighting-app/lighting-common/gen/gen_config.h rename to zzz_generated/lighting-app/zap-generated/gen_config.h diff --git a/examples/lock-app/lock-common/gen/gen_tokens.h b/zzz_generated/lighting-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/lock-app/lock-common/gen/gen_tokens.h rename to zzz_generated/lighting-app/zap-generated/gen_tokens.h diff --git a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/lock-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/lock-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.h b/zzz_generated/lock-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/lock-app/lock-common/gen/CHIPClientCallbacks.h rename to zzz_generated/lock-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/lock-app/lock-common/gen/CHIPClusters.cpp b/zzz_generated/lock-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/lock-app/lock-common/gen/CHIPClusters.cpp rename to zzz_generated/lock-app/zap-generated/CHIPClusters.cpp diff --git a/examples/lock-app/lock-common/gen/CHIPClusters.h b/zzz_generated/lock-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/lock-app/lock-common/gen/CHIPClusters.h rename to zzz_generated/lock-app/zap-generated/CHIPClusters.h diff --git a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/lock-app/lock-common/gen/af-gen-event.h b/zzz_generated/lock-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/lock-app/lock-common/gen/af-gen-event.h rename to zzz_generated/lock-app/zap-generated/af-gen-event.h diff --git a/examples/lock-app/lock-common/gen/attribute-size.cpp b/zzz_generated/lock-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/lock-app/lock-common/gen/attribute-size.cpp rename to zzz_generated/lock-app/zap-generated/attribute-size.cpp diff --git a/examples/lock-app/lock-common/gen/callback-stub.cpp b/zzz_generated/lock-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/lock-app/lock-common/gen/callback-stub.cpp rename to zzz_generated/lock-app/zap-generated/callback-stub.cpp diff --git a/examples/lock-app/lock-common/gen/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/lock-app/lock-common/gen/endpoint_config.h rename to zzz_generated/lock-app/zap-generated/endpoint_config.h diff --git a/examples/lock-app/lock-common/gen/gen_config.h b/zzz_generated/lock-app/zap-generated/gen_config.h similarity index 100% rename from examples/lock-app/lock-common/gen/gen_config.h rename to zzz_generated/lock-app/zap-generated/gen_config.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/gen_tokens.h b/zzz_generated/lock-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/gen_tokens.h rename to zzz_generated/lock-app/zap-generated/gen_tokens.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/CHIPClientCallbacks.h b/zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/CHIPClientCallbacks.h rename to zzz_generated/ota-provider-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/CHIPClusters.cpp b/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/CHIPClusters.cpp rename to zzz_generated/ota-provider-app/zap-generated/CHIPClusters.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/CHIPClusters.h b/zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/CHIPClusters.h rename to zzz_generated/ota-provider-app/zap-generated/CHIPClusters.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/af-gen-event.h b/zzz_generated/ota-provider-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/af-gen-event.h rename to zzz_generated/ota-provider-app/zap-generated/af-gen-event.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/attribute-size.cpp b/zzz_generated/ota-provider-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/attribute-size.cpp rename to zzz_generated/ota-provider-app/zap-generated/attribute-size.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/call-command-handler.cpp b/zzz_generated/ota-provider-app/zap-generated/call-command-handler.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/call-command-handler.cpp rename to zzz_generated/ota-provider-app/zap-generated/call-command-handler.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/call-command-handler.h b/zzz_generated/ota-provider-app/zap-generated/call-command-handler.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/call-command-handler.h rename to zzz_generated/ota-provider-app/zap-generated/call-command-handler.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/callback-stub.cpp b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/callback-stub.cpp rename to zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/callback.h b/zzz_generated/ota-provider-app/zap-generated/callback.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/callback.h rename to zzz_generated/ota-provider-app/zap-generated/callback.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/chip-zcl-zpro-codec-api.h b/zzz_generated/ota-provider-app/zap-generated/chip-zcl-zpro-codec-api.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/chip-zcl-zpro-codec-api.h rename to zzz_generated/ota-provider-app/zap-generated/chip-zcl-zpro-codec-api.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/encoder.cpp b/zzz_generated/ota-provider-app/zap-generated/encoder.cpp similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/encoder.cpp rename to zzz_generated/ota-provider-app/zap-generated/encoder.cpp diff --git a/examples/ota-provider-app/ota-provider-common/gen/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/endpoint_config.h rename to zzz_generated/ota-provider-app/zap-generated/endpoint_config.h diff --git a/examples/ota-provider-app/ota-provider-common/gen/gen_config.h b/zzz_generated/ota-provider-app/zap-generated/gen_config.h similarity index 100% rename from examples/ota-provider-app/ota-provider-common/gen/gen_config.h rename to zzz_generated/ota-provider-app/zap-generated/gen_config.h diff --git a/examples/pump-app/pump-common/gen/gen_tokens.h b/zzz_generated/ota-provider-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/pump-app/pump-common/gen/gen_tokens.h rename to zzz_generated/ota-provider-app/zap-generated/gen_tokens.h diff --git a/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp similarity index 99% rename from examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp index 449d32084886ff..39fbf25cde1c6f 100644 --- a/examples/pump-app/pump-common/gen/CHIPClientCallbacks.cpp +++ b/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp @@ -17,7 +17,7 @@ // THIS FILE IS GENERATED BY ZAP -#include "gen/CHIPClientCallbacks.h" +#include #include diff --git a/examples/pump-app/pump-common/gen/CHIPClientCallbacks.h b/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/pump-app/pump-common/gen/CHIPClientCallbacks.h rename to zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/pump-app/pump-common/gen/CHIPClusters.cpp b/zzz_generated/pump-app/zap-generated/CHIPClusters.cpp similarity index 99% rename from examples/pump-app/pump-common/gen/CHIPClusters.cpp rename to zzz_generated/pump-app/zap-generated/CHIPClusters.cpp index e0f6b8d75be223..d02dcb0b9359a1 100644 --- a/examples/pump-app/pump-common/gen/CHIPClusters.cpp +++ b/zzz_generated/pump-app/zap-generated/CHIPClusters.cpp @@ -31,9 +31,9 @@ #include #include -#include #include #include +#include #define COMMAND_HEADER(name, clusterId) \ const char * kName = name; \ diff --git a/examples/pump-app/pump-common/gen/CHIPClusters.h b/zzz_generated/pump-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/pump-app/pump-common/gen/CHIPClusters.h rename to zzz_generated/pump-app/zap-generated/CHIPClusters.h diff --git a/examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/pump-app/pump-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/pump-app/pump-common/gen/af-gen-event.h b/zzz_generated/pump-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/pump-app/pump-common/gen/af-gen-event.h rename to zzz_generated/pump-app/zap-generated/af-gen-event.h diff --git a/examples/pump-app/pump-common/gen/attribute-size.cpp b/zzz_generated/pump-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/pump-app/pump-common/gen/attribute-size.cpp rename to zzz_generated/pump-app/zap-generated/attribute-size.cpp diff --git a/examples/pump-app/pump-common/gen/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/pump-app/pump-common/gen/callback-stub.cpp rename to zzz_generated/pump-app/zap-generated/callback-stub.cpp diff --git a/examples/pump-app/pump-common/gen/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/pump-app/pump-common/gen/endpoint_config.h rename to zzz_generated/pump-app/zap-generated/endpoint_config.h diff --git a/examples/pump-app/pump-common/gen/gen_config.h b/zzz_generated/pump-app/zap-generated/gen_config.h similarity index 100% rename from examples/pump-app/pump-common/gen/gen_config.h rename to zzz_generated/pump-app/zap-generated/gen_config.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/gen_tokens.h b/zzz_generated/pump-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/gen_tokens.h rename to zzz_generated/pump-app/zap-generated/gen_tokens.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp similarity index 99% rename from examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp index 449d32084886ff..39fbf25cde1c6f 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp @@ -17,7 +17,7 @@ // THIS FILE IS GENERATED BY ZAP -#include "gen/CHIPClientCallbacks.h" +#include #include diff --git a/examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.h b/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/CHIPClientCallbacks.h rename to zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/CHIPClusters.cpp b/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.cpp similarity index 99% rename from examples/pump-controller-app/pump-controller-common/gen/CHIPClusters.cpp rename to zzz_generated/pump-controller-app/zap-generated/CHIPClusters.cpp index 8c2561b44f83d9..99595abc1c891a 100644 --- a/examples/pump-controller-app/pump-controller-common/gen/CHIPClusters.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.cpp @@ -31,9 +31,9 @@ #include #include -#include #include #include +#include #define COMMAND_HEADER(name, clusterId) \ const char * kName = name; \ diff --git a/examples/pump-controller-app/pump-controller-common/gen/CHIPClusters.h b/zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/CHIPClusters.h rename to zzz_generated/pump-controller-app/zap-generated/CHIPClusters.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/pump-controller-app/pump-controller-common/gen/af-gen-event.h b/zzz_generated/pump-controller-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/af-gen-event.h rename to zzz_generated/pump-controller-app/zap-generated/af-gen-event.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp b/zzz_generated/pump-controller-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/attribute-size.cpp rename to zzz_generated/pump-controller-app/zap-generated/attribute-size.cpp diff --git a/examples/pump-controller-app/pump-controller-common/gen/callback-stub.cpp b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/callback-stub.cpp rename to zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp diff --git a/examples/pump-controller-app/pump-controller-common/gen/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/endpoint_config.h rename to zzz_generated/pump-controller-app/zap-generated/endpoint_config.h diff --git a/examples/pump-controller-app/pump-controller-common/gen/gen_config.h b/zzz_generated/pump-controller-app/zap-generated/gen_config.h similarity index 100% rename from examples/pump-controller-app/pump-controller-common/gen/gen_config.h rename to zzz_generated/pump-controller-app/zap-generated/gen_config.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/gen_tokens.h b/zzz_generated/pump-controller-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/gen_tokens.h rename to zzz_generated/pump-controller-app/zap-generated/gen_tokens.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp b/zzz_generated/temperature-measurement-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp rename to zzz_generated/temperature-measurement-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h b/zzz_generated/temperature-measurement-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h rename to zzz_generated/temperature-measurement-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClusters.cpp b/zzz_generated/temperature-measurement-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/CHIPClusters.cpp rename to zzz_generated/temperature-measurement-app/zap-generated/CHIPClusters.cpp diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClusters.h b/zzz_generated/temperature-measurement-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/CHIPClusters.h rename to zzz_generated/temperature-measurement-app/zap-generated/CHIPClusters.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp rename to zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/temperature-measurement-app/esp32/main/gen/af-gen-event.h b/zzz_generated/temperature-measurement-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/af-gen-event.h rename to zzz_generated/temperature-measurement-app/zap-generated/af-gen-event.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp b/zzz_generated/temperature-measurement-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/attribute-size.cpp rename to zzz_generated/temperature-measurement-app/zap-generated/attribute-size.cpp diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp rename to zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp diff --git a/examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h rename to zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h diff --git a/examples/temperature-measurement-app/esp32/main/gen/gen_config.h b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h similarity index 100% rename from examples/temperature-measurement-app/esp32/main/gen/gen_config.h rename to zzz_generated/temperature-measurement-app/zap-generated/gen_config.h diff --git a/examples/thermostat/thermostat-common/gen/gen_tokens.h b/zzz_generated/temperature-measurement-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/gen_tokens.h rename to zzz_generated/temperature-measurement-app/zap-generated/gen_tokens.h diff --git a/examples/thermostat/thermostat-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/thermostat/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/thermostat/thermostat-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/thermostat/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/thermostat/thermostat-common/gen/CHIPClientCallbacks.h b/zzz_generated/thermostat/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/CHIPClientCallbacks.h rename to zzz_generated/thermostat/zap-generated/CHIPClientCallbacks.h diff --git a/examples/thermostat/thermostat-common/gen/CHIPClusters.cpp b/zzz_generated/thermostat/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/thermostat/thermostat-common/gen/CHIPClusters.cpp rename to zzz_generated/thermostat/zap-generated/CHIPClusters.cpp diff --git a/examples/thermostat/thermostat-common/gen/CHIPClusters.h b/zzz_generated/thermostat/zap-generated/CHIPClusters.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/CHIPClusters.h rename to zzz_generated/thermostat/zap-generated/CHIPClusters.h diff --git a/examples/thermostat/thermostat-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/thermostat/thermostat-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/thermostat/thermostat-common/gen/af-gen-event.h b/zzz_generated/thermostat/zap-generated/af-gen-event.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/af-gen-event.h rename to zzz_generated/thermostat/zap-generated/af-gen-event.h diff --git a/examples/thermostat/thermostat-common/gen/attribute-size.cpp b/zzz_generated/thermostat/zap-generated/attribute-size.cpp similarity index 100% rename from examples/thermostat/thermostat-common/gen/attribute-size.cpp rename to zzz_generated/thermostat/zap-generated/attribute-size.cpp diff --git a/examples/thermostat/thermostat-common/gen/callback-stub.cpp b/zzz_generated/thermostat/zap-generated/callback-stub.cpp similarity index 100% rename from examples/thermostat/thermostat-common/gen/callback-stub.cpp rename to zzz_generated/thermostat/zap-generated/callback-stub.cpp diff --git a/examples/thermostat/thermostat-common/gen/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/endpoint_config.h rename to zzz_generated/thermostat/zap-generated/endpoint_config.h diff --git a/examples/thermostat/thermostat-common/gen/gen_config.h b/zzz_generated/thermostat/zap-generated/gen_config.h similarity index 100% rename from examples/thermostat/thermostat-common/gen/gen_config.h rename to zzz_generated/thermostat/zap-generated/gen_config.h diff --git a/examples/tv-app/tv-common/gen/gen_tokens.h b/zzz_generated/thermostat/zap-generated/gen_tokens.h similarity index 100% rename from examples/tv-app/tv-common/gen/gen_tokens.h rename to zzz_generated/thermostat/zap-generated/gen_tokens.h diff --git a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.h b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/tv-app/tv-common/gen/CHIPClientCallbacks.h rename to zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/tv-app/tv-common/gen/CHIPClusters.cpp b/zzz_generated/tv-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/tv-app/tv-common/gen/CHIPClusters.cpp rename to zzz_generated/tv-app/zap-generated/CHIPClusters.cpp diff --git a/examples/tv-app/tv-common/gen/CHIPClusters.h b/zzz_generated/tv-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/tv-app/tv-common/gen/CHIPClusters.h rename to zzz_generated/tv-app/zap-generated/CHIPClusters.h diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/tv-app/tv-common/gen/af-gen-event.h b/zzz_generated/tv-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/tv-app/tv-common/gen/af-gen-event.h rename to zzz_generated/tv-app/zap-generated/af-gen-event.h diff --git a/examples/tv-app/tv-common/gen/attribute-size.cpp b/zzz_generated/tv-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/tv-app/tv-common/gen/attribute-size.cpp rename to zzz_generated/tv-app/zap-generated/attribute-size.cpp diff --git a/examples/tv-app/tv-common/gen/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/tv-app/tv-common/gen/callback-stub.cpp rename to zzz_generated/tv-app/zap-generated/callback-stub.cpp diff --git a/examples/tv-app/tv-common/gen/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/tv-app/tv-common/gen/endpoint_config.h rename to zzz_generated/tv-app/zap-generated/endpoint_config.h diff --git a/examples/tv-app/tv-common/gen/gen_config.h b/zzz_generated/tv-app/zap-generated/gen_config.h similarity index 100% rename from examples/tv-app/tv-common/gen/gen_config.h rename to zzz_generated/tv-app/zap-generated/gen_config.h diff --git a/examples/window-app/common/gen/gen_tokens.h b/zzz_generated/tv-app/zap-generated/gen_tokens.h similarity index 100% rename from examples/window-app/common/gen/gen_tokens.h rename to zzz_generated/tv-app/zap-generated/gen_tokens.h diff --git a/examples/window-app/common/gen/CHIPClientCallbacks.cpp b/zzz_generated/window-app/zap-generated/CHIPClientCallbacks.cpp similarity index 100% rename from examples/window-app/common/gen/CHIPClientCallbacks.cpp rename to zzz_generated/window-app/zap-generated/CHIPClientCallbacks.cpp diff --git a/examples/window-app/common/gen/CHIPClientCallbacks.h b/zzz_generated/window-app/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from examples/window-app/common/gen/CHIPClientCallbacks.h rename to zzz_generated/window-app/zap-generated/CHIPClientCallbacks.h diff --git a/examples/window-app/common/gen/CHIPClusters.cpp b/zzz_generated/window-app/zap-generated/CHIPClusters.cpp similarity index 100% rename from examples/window-app/common/gen/CHIPClusters.cpp rename to zzz_generated/window-app/zap-generated/CHIPClusters.cpp diff --git a/examples/window-app/common/gen/CHIPClusters.h b/zzz_generated/window-app/zap-generated/CHIPClusters.h similarity index 100% rename from examples/window-app/common/gen/CHIPClusters.h rename to zzz_generated/window-app/zap-generated/CHIPClusters.h diff --git a/examples/window-app/common/gen/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from examples/window-app/common/gen/IMClusterCommandHandler.cpp rename to zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp diff --git a/examples/window-app/common/gen/af-gen-event.h b/zzz_generated/window-app/zap-generated/af-gen-event.h similarity index 100% rename from examples/window-app/common/gen/af-gen-event.h rename to zzz_generated/window-app/zap-generated/af-gen-event.h diff --git a/examples/window-app/common/gen/attribute-size.cpp b/zzz_generated/window-app/zap-generated/attribute-size.cpp similarity index 100% rename from examples/window-app/common/gen/attribute-size.cpp rename to zzz_generated/window-app/zap-generated/attribute-size.cpp diff --git a/examples/window-app/common/gen/callback-stub.cpp b/zzz_generated/window-app/zap-generated/callback-stub.cpp similarity index 100% rename from examples/window-app/common/gen/callback-stub.cpp rename to zzz_generated/window-app/zap-generated/callback-stub.cpp diff --git a/examples/window-app/common/gen/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h similarity index 100% rename from examples/window-app/common/gen/endpoint_config.h rename to zzz_generated/window-app/zap-generated/endpoint_config.h diff --git a/examples/window-app/common/gen/gen_config.h b/zzz_generated/window-app/zap-generated/gen_config.h similarity index 100% rename from examples/window-app/common/gen/gen_config.h rename to zzz_generated/window-app/zap-generated/gen_config.h diff --git a/src/controller/data_model/gen/gen_tokens.h b/zzz_generated/window-app/zap-generated/gen_tokens.h similarity index 100% rename from src/controller/data_model/gen/gen_tokens.h rename to zzz_generated/window-app/zap-generated/gen_tokens.h