Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 45 commits into from
Aug 20, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
154fd72
Start creating a zzz_generated folder
andy31415 Aug 18, 2021
183fd83
Allow output folder argument in zap generation python script. Verifie…
andy31415 Aug 18, 2021
f2619c8
moved all generated files from examples into zzz_generated (by runnin…
andy31415 Aug 18, 2021
9610421
Update gen folder as "zap-generated"
andy31415 Aug 18, 2021
cf9fadd
Rename gen to zap-generated in includes
andy31415 Aug 18, 2021
8d461fe
More generated path renaming
andy31415 Aug 18, 2021
7df3f34
update the cluster template generation to use the new zap-generated name
andy31415 Aug 18, 2021
b218e6d
Rename more zap generated files
andy31415 Aug 18, 2021
19df603
more renames and zapt updates. Fix build rule dependency
andy31415 Aug 18, 2021
4460b9f
Add config dependency on data model: only need include paths
andy31415 Aug 18, 2021
e964a87
Fix include order. Lighting app on linux compiles
andy31415 Aug 18, 2021
4892cdd
Add TODO regarding config path ordering
andy31415 Aug 18, 2021
334e332
Prepare example generated files: nrf builds compile
andy31415 Aug 18, 2021
93e727b
Make lock app compile on nrf with the new directory structure
andy31415 Aug 18, 2021
261f97f
Merge branch 'master' into separate_generated
andy31415 Aug 18, 2021
77b6b07
update telink makefile to match the new zap generated outputs
andy31415 Aug 18, 2021
060af72
More compile logic updates
andy31415 Aug 18, 2021
088c6a7
Merge branch 'master' into separate_generated
andy31415 Aug 18, 2021
d430066
esp32 compiles now
andy31415 Aug 18, 2021
116d603
Make the bridge app compile on esp32
andy31415 Aug 18, 2021
36b2320
Exclude zap generated files from doxygen
andy31415 Aug 19, 2021
e928680
Fix typo in CHIPCert, move the darwin header/mm files
andy31415 Aug 19, 2021
acfeb35
Update a few more gen folder usages
andy31415 Aug 19, 2021
dd801a6
Update java to zap-generated, move more files around
andy31415 Aug 19, 2021
eb6fefb
Restyle fixes
andy31415 Aug 19, 2021
dd3dfb8
Update path inside pbxproj
andy31415 Aug 19, 2021
750618a
Fix up lighting app cmake for mbed
andy31415 Aug 19, 2021
b4abc72
Update lock generated files for esp32 lock app
andy31415 Aug 19, 2021
fb18204
Update paths for generated file for lock app cmakefiles
andy31415 Aug 19, 2021
b782112
One more cmake fix for esp32
andy31415 Aug 19, 2021
cacbb35
Update CMakeLists.txt for the temperature measurement app
andy31415 Aug 19, 2021
a022c7a
Add back af-gen-event.h even though they are NOT currently generated
andy31415 Aug 20, 2021
7c8784f
Undo the data_model include logic
andy31415 Aug 20, 2021
76e4937
Merge branch 'master' into separate_generated
andy31415 Aug 20, 2021
84e331e
Move ota-provider-app to zzz_generated
andy31415 Aug 20, 2021
f971bde
Fix android build
andy31415 Aug 20, 2021
709ac59
Fix ota provider app build path for zap generated files
andy31415 Aug 20, 2021
99ec91d
Restyle fixes
andy31415 Aug 20, 2021
2b7518e
Merge branch 'master' into separate_generated
andy31415 Aug 20, 2021
5d6c0ad
Fix up ota build
andy31415 Aug 20, 2021
47d78ff
Updated fix for ota provider app build rules
andy31415 Aug 20, 2021
a879fc6
Create ota-provider-app config globally, to fix up includes for commo…
andy31415 Aug 20, 2021
351eb49
Restyle fixes
andy31415 Aug 20, 2021
2259a2a
Update relative paths into ota-provider-common to use top level include
andy31415 Aug 20, 2021
4bbc0c3
Do not use relative path in includes in ota provider common
andy31415 Aug 20, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions examples/ota-provider-app/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")

config("config") {
include_dirs = [ "." ]
}

executable("chip-ota-provider-app") {
sources = [ "main.cpp" ]

Expand All @@ -29,6 +33,8 @@ executable("chip-ota-provider-app") {
cflags = [ "-Wconversion" ]

output_dir = root_out_dir

configs = [ ":config" ]
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
}

group("linux") {
Expand Down
4 changes: 2 additions & 2 deletions examples/ota-provider-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include <support/RandUtils.h>
#include <support/logging/CHIPLogging.h>

#include "BdxOtaSender.h"
#include "OTAProviderExample.h"
#include <ota-provider-common/BdxOtaSender.h>
#include <ota-provider-common/OTAProviderExample.h>

#include <fstream>
#include <iostream>
Expand Down
7 changes: 1 addition & 6 deletions examples/ota-provider-app/ota-provider-common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ 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"

Expand All @@ -30,11 +26,10 @@ chip_data_model("ota-provider-common") {
"BdxOtaSender.cpp",
"BdxOtaSender.h",
"OTAProviderExample.cpp",
"OTAProviderExample.h",
]

deps = [ "${chip_root}/src/protocols/bdx" ]

is_server = true

public_configs = [ ":config" ]
}