Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Move build/config to config #426

Merged
merged 4 commits into from
Apr 20, 2020
Merged

Move build/config to config #426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b8b9a6
move build_config to config
Apr 20, 2020
e6d5cf6
mv build/scripts
Apr 20, 2020
102a0ab
Restyled by clang-format
restyled-commits Apr 20, 2020
d2018fa
move build/autoconf to autoconf
Apr 20, 2020
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
Next Next commit
move build_config to config
  • Loading branch information
Rob Walker committed Apr 20, 2020
commit 1b8b9a6fd9a39d6c9e7afef8296d00d36907b089
7 changes: 0 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ build/*
!build/README.md
!build/autoconf/m4/chip_check_project_config_includes.m4
!build/autoconf/m4/nl_with_lwip.m4
!build/config/standalone/CHIPProjectConfig.h
!build/config/standalone/SystemProjectConfig.h
!build/config/standalone/darwin/CHIPProjectConfig.h
!build/config/standalone/no-openssl/CHIPProjectConfig.h
!build/efr32/
!build/esp32/
!build/nrf5/
!build/scripts/gen-chip-version
examples/**/build
config.log
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"${workspaceFolder}/build/default/src/**",
"${workspaceFolder}/build/default/src/include/**",
"${workspaceFolder}/build/default/src/lib/**",
"${workspaceFolder}/build/config/standalone/",
"${workspaceFolder}/build/config/standalone/**",
"${workspaceFolder}/config/standalone/",
"${workspaceFolder}/config/standalone/**",
"${workspaceFolder}/examples/**",
"${workspaceFolder}/src/**",
"${workspaceFolder}/src/include/",
Expand Down
2 changes: 1 addition & 1 deletion Makefile-Android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ JNI_INCLUDE_DIRS="$(JNI_INCLUDE_DIRS)" \
--host=$(ABI_CONFIG_TUPLE_$(1)) \
--with-sysroot=$(ABI_SYSROOT) \
--with-libtool-sysroot=$(ABI_SYSROOT) \
--with-chip-project-includes=$(AbsTopSourceDir)/build/config/android \
--with-chip-project-includes=$(AbsTopSourceDir)/config/android \
--prefix=/ \
--exec-prefix=/$(ABI_CONFIG_TUPLE_$(1)) \
$(CONFIGURE_OPTIONS))
Expand Down
6 changes: 3 additions & 3 deletions Makefile-Standalone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ AbsTopResultDir = $(CURDIR)/$(TopResultDir)
TargetTuple = $(shell ${AbsTopSourceDir}/third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess | sed -e 's/[[:digit:].]*$$//g')

ifeq ($(HOSTOS),darwin)
ProjectConfigDir ?= $(AbsTopSourceDir)/build/config/standalone/darwin
ProjectConfigDir ?= $(AbsTopSourceDir)/config/standalone/darwin
else
ProjectConfigDir ?= $(AbsTopSourceDir)/build/config/standalone
ProjectConfigDir ?= $(AbsTopSourceDir)/config/standalone
endif

ifeq ($(ARCH),x86_64)
Expand Down Expand Up @@ -120,7 +120,7 @@ endif
configure_OPTIONS += --with-openssl=$(OPENSSL)
ifeq ($(OPENSSL),no)
configure_OPTIONS += --disable-tools
ProjectConfigDir = $(AbsTopSourceDir)/build/config/standalone/no-openssl
ProjectConfigDir = $(AbsTopSourceDir)/config/standalone/no-openssl
endif

# If the user has asserted USE_FUZZING enable fuzzing build
Expand Down
2 changes: 1 addition & 1 deletion Makefile-iOS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ ac_cv_have_decl_clock_gettime=no \
--target=$($(1)_arch_AUTOTOOLS)-$(TargetTupleStem) \
--prefix=/ \
--exec-prefix=/$(1)-$(TargetTuple) \
--with-chip-project-includes=$(AbsTopSourceDir)/build/config/ios \
--with-chip-project-includes=$(AbsTopSourceDir)/config/ios \
--with-logging-style=external \
--enable-cocoa \
--disable-docs \
Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ EXTRA_DIST = \
bootstrap-configure \
repos.conf \
$(srcdir)/build/autoconf \
$(srcdir)/build/config \
$(srcdir)/build/efr32 \
$(srcdir)/build/nrf5 \
$(srcdir)/config \
$(srcdir)/config/efr32 \
$(srcdir)/config/nrf5 \
$(srcdir)/build/scripts \
$(NULL)

Expand Down
2 changes: 1 addition & 1 deletion build/efr32/efr32-app.mk → config/efr32/efr32-app.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#
# PROJECT_ROOT = $(realpath .)
#
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/build/efr32
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/config/efr32
#
# include $(BUILD_SUPPORT_DIR)/efr32-app.mk
# include $(BUILD_SUPPORT_DIR)/efr32-chip.mk
Expand Down
2 changes: 1 addition & 1 deletion build/efr32/efr32-chip.mk → config/efr32/efr32-chip.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#
# PROJECT_ROOT = $(realpath .)
#
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/build/efr32
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/config/efr32
#
# include $(BUILD_SUPPORT_DIR)/efr32-app.mk
# include $(BUILD_SUPPORT_DIR)/efr32-chip.mk
Expand Down
2 changes: 1 addition & 1 deletion build/efr32/efr32-freertos.mk → config/efr32/efr32-freertos.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#
# PROJECT_ROOT = $(realpath .)
#
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/openweave-core/build/efr32
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/openweave-core/config/efr32
#
# include $(BUILD_SUPPORT_DIR)/efr32-app.mk
# include $(BUILD_SUPPORT_DIR)/efr32-openweave.mk
Expand Down
2 changes: 1 addition & 1 deletion build/nrf5/nrf5-app.mk → config/nrf5/nrf5-app.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#
# PROJECT_ROOT = $(realpath .)
#
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/build/nrf5
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/config/nrf5
#
# include $(BUILD_SUPPORT_DIR)/nrf5-app.mk
#
Expand Down
2 changes: 1 addition & 1 deletion build/nrf5/nrf5-chip.mk → config/nrf5/nrf5-chip.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#
# PROJECT_ROOT = $(realpath .)
#
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/build/nrf5
# BUILD_SUPPORT_DIR = $(PROJECT_ROOT)/third_party/connectedhomeip/config/nrf5
#
# include $(BUILD_SUPPORT_DIR)/nrf5-app.mk
# include $(BUILD_SUPPORT_DIR)/nrf5-chip.mk
Expand Down
0 build/config/standalone/CHIPProjectConfig.h → config/standalone/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...d/config/standalone/SystemProjectConfig.h → config/standalone/SystemProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...fig/standalone/darwin/CHIPProjectConfig.h → config/standalone/darwin/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
0 ...standalone/no-openssl/CHIPProjectConfig.h → ...standalone/no-openssl/CHIPProjectConfig.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,23 +1274,23 @@ AC_LANG_PUSH([C++])

# SystemLayer

CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-system-project-includes, SYSTEM_PROJECT_CONFIG_INCLUDE, SystemProjectConfig.h, CHIP System Layer, ${ac_abs_confdir}/build/config/standalone)
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-system-project-includes, SYSTEM_PROJECT_CONFIG_INCLUDE, SystemProjectConfig.h, CHIP System Layer, ${ac_abs_confdir}/config/standalone)

# BleLayer

if test ${CONFIG_NETWORK_LAYER_BLE} = 1; then
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-ble-project-includes, BLE_PROJECT_CONFIG_INCLUDE, BleProjectConfig.h, CHIP BLE Layer, ${ac_abs_confdir}/build/config/standalone)
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-ble-project-includes, BLE_PROJECT_CONFIG_INCLUDE, BleProjectConfig.h, CHIP BLE Layer, ${ac_abs_confdir}/config/standalone)
fi

# InetLayer

if test ${CONFIG_NETWORK_LAYER_INET} = 1; then
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-inet-project-includes, INET_PROJECT_CONFIG_INCLUDE, InetProjectConfig.h, CHIP Inet Layer, ${ac_abs_confdir}/build/config/standalone)
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-inet-project-includes, INET_PROJECT_CONFIG_INCLUDE, InetProjectConfig.h, CHIP Inet Layer, ${ac_abs_confdir}/config/standalone)
fi

# Core

CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-project-includes, CHIP_PROJECT_CONFIG_INCLUDE, CHIPProjectConfig.h, CHIP Core, ${ac_abs_confdir}/build/config/standalone)
CHIP_CHECK_PROJECT_CONFIG_INCLUDES(chip-project-includes, CHIP_PROJECT_CONFIG_INCLUDE, CHIPProjectConfig.h, CHIP Core, ${ac_abs_confdir}/config/standalone)

# Device Layer

Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/efr32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ GECKO_SDK_SUITE_DIR := $(EFR32_SDK_ROOT)/..

all : |

BUILD_SUPPORT_DIR := $(CHIP_ROOT)/build/efr32
BUILD_SUPPORT_DIR := $(CHIP_ROOT)/config/efr32

include $(BUILD_SUPPORT_DIR)/efr32-app.mk
include $(BUILD_SUPPORT_DIR)/efr32-chip.mk
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/nrf5/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
PROJECT_ROOT := $(realpath .)

CHIP_ROOT ?= $(realpath $(PROJECT_ROOT)/third_party/connectedhomeip)
BUILD_SUPPORT_DIR = $(CHIP_ROOT)/build/nrf5
BUILD_SUPPORT_DIR = $(CHIP_ROOT)/config/nrf5

include $(BUILD_SUPPORT_DIR)/nrf5-app.mk
include $(BUILD_SUPPORT_DIR)/nrf5-chip.mk
Expand Down