Start separating generated files in unique folder instead of inside the src/example tree

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

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
 }

examples/all-clusters-app/esp32/main/CMakeLists.txt

@@ -18,15 +18,17 @@
 # (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/src/controller/data_model/"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
 )
 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"

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!

examples/bridge-app/esp32/main/CMakeLists.txt

@@ -17,11 +17,13 @@
 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/src/controller/data_model/"
                       "${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"

examples/bridge-app/linux/include/Device.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-//#include "gen/attribute-id.h"
-//#include "gen/cluster-id.h"
+//#include <zap-generated/attribute-id.h>
+//#include <zap-generated/cluster-id.h>
 //#include <app/chip-zcl-zpro-codec.h>
 //#include <app/util/af-types.h>
 //#include <app/util/af.h>

examples/chip-tool-darwin/main.m

@@ -23,7 +23,7 @@
 #import <CHIP/CHIPPersistentStorageDelegate.h>
 #import <CHIP/CHIPQRCodeSetupPayloadParser.h>
 #import <CHIP/CHIPSetupPayload.h>
-#import <CHIP/gen/CHIPClustersObjc.h>
+#import <CHIP/zap-generated/CHIPClustersObjc.h>
 #import <Foundation/Foundation.h>
 
 int main(int argc, const char * argv[]) { return EXIT_SUCCESS; }

examples/chip-tool/commands/clusters/Commands.h

@@ -22,10 +22,10 @@
 #include <cstdint>
 
 #include "ModelCommand.h"
-#include "gen/CHIPClientCallbacks.h"
-#include "gen/CHIPClusters.h"
 #include <lib/core/CHIPSafeCasts.h>
 #include <support/BytesToHex.h>
+#include <zap-generated/CHIPClientCallbacks.h>
+#include <zap-generated/CHIPClusters.h>
 
 static void OnDefaultSuccessResponse(void * context)
 {