From 644e0a30f7e2eab26af07f9134e9bddee9e27c05 Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Wed, 12 Aug 2020 01:18:25 +0800 Subject: [PATCH] [test] only check include/openthread for API version (#5370) --- configure.ac | 2 - include/Makefile.am | 77 ++++++++++++++++++- include/openthread/Makefile.am | 98 ------------------------- include/openthread/platform/Makefile.am | 60 --------------- script/check-api-version | 4 +- 5 files changed, 75 insertions(+), 166 deletions(-) delete mode 100644 include/openthread/Makefile.am delete mode 100644 include/openthread/platform/Makefile.am diff --git a/configure.ac b/configure.ac index 31829bb7d..b817f1dba 100644 --- a/configure.ac +++ b/configure.ac @@ -1014,8 +1014,6 @@ NL_RESTORE_WERROR AC_CONFIG_FILES([ Makefile include/Makefile -include/openthread/Makefile -include/openthread/platform/Makefile src/Makefile src/cli/Makefile src/ncp/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index e6ab56006..920e506bf 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -30,14 +30,83 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am # Always package (e.g. for 'make dist') these subdirectories. -DIST_SUBDIRS = \ +EXTRA_DIST = \ openthread \ $(NULL) -# Always build (e.g. for 'make all') these subdirectories. +openthread_headers = \ + openthread/backbone_router.h \ + openthread/backbone_router_ftd.h \ + openthread/border_agent.h \ + openthread/border_router.h \ + openthread/channel_manager.h \ + openthread/channel_monitor.h \ + openthread/child_supervision.h \ + openthread/cli.h \ + openthread/coap_secure.h \ + openthread/coap.h \ + openthread/commissioner.h \ + openthread/crypto.h \ + openthread/dataset.h \ + openthread/dataset_ftd.h \ + openthread/diag.h \ + openthread/dns.h \ + openthread/entropy.h \ + openthread/error.h \ + openthread/heap.h \ + openthread/icmp6.h \ + openthread/instance.h \ + openthread/ip6.h \ + openthread/jam_detection.h \ + openthread/joiner.h \ + openthread/link.h \ + openthread/link_raw.h \ + openthread/logging.h \ + openthread/message.h \ + openthread/ncp.h \ + openthread/netdata.h \ + openthread/netdiag.h \ + openthread/network_time.h \ + openthread/random_crypto.h \ + openthread/random_noncrypto.h \ + openthread/server.h \ + openthread/sntp.h \ + openthread/tasklet.h \ + openthread/thread.h \ + openthread/thread_ftd.h \ + openthread/udp.h \ + $(NULL) -SUBDIRS = \ - openthread \ +openthreaddir = $(includedir)/openthread +dist_openthread_HEADERS = $(openthread_headers) + +ot_platform_headers = \ + openthread/platform/alarm-micro.h \ + openthread/platform/alarm-milli.h \ + openthread/platform/ble.h \ + openthread/platform/diag.h \ + openthread/platform/flash.h \ + openthread/platform/entropy.h \ + openthread/platform/memory.h \ + openthread/platform/misc.h \ + openthread/platform/logging.h \ + openthread/platform/otns.h \ + openthread/platform/radio.h \ + openthread/platform/time.h \ + openthread/platform/uart.h \ + openthread/platform/udp.h \ + openthread/platform/spi-slave.h \ + openthread/platform/settings.h \ + openthread/platform/messagepool.h \ + openthread/platform/toolchain.h \ + $(NULL) + +ot_platformdir = $(includedir)/openthread/platform +dist_ot_platform_HEADERS = $(ot_platform_headers) + +noinst_HEADERS = \ + openthread/config.h \ + openthread/platform/debug_uart.h \ $(NULL) install-headers: install-includeHEADERS diff --git a/include/openthread/Makefile.am b/include/openthread/Makefile.am deleted file mode 100644 index 448d8e03d..000000000 --- a/include/openthread/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (c) 2016, The OpenThread Authors. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -include $(abs_top_nlbuild_autotools_dir)/automake/pre.am - -# Always package (e.g. for 'make dist') these subdirectories. - -DIST_SUBDIRS = \ - platform \ - $(NULL) - -# Always build (e.g. for 'make all') these subdirectories. - -SUBDIRS = \ - platform \ - $(NULL) - -openthread_headers = \ - backbone_router.h \ - backbone_router_ftd.h \ - border_agent.h \ - border_router.h \ - channel_manager.h \ - channel_monitor.h \ - child_supervision.h \ - cli.h \ - coap_secure.h \ - coap.h \ - commissioner.h \ - crypto.h \ - dataset.h \ - dataset_ftd.h \ - diag.h \ - dns.h \ - entropy.h \ - error.h \ - heap.h \ - icmp6.h \ - instance.h \ - ip6.h \ - jam_detection.h \ - joiner.h \ - link.h \ - link_raw.h \ - logging.h \ - message.h \ - ncp.h \ - netdata.h \ - netdiag.h \ - network_time.h \ - random_crypto.h \ - random_noncrypto.h \ - server.h \ - sntp.h \ - tasklet.h \ - thread.h \ - thread_ftd.h \ - udp.h \ - $(NULL) - -openthreaddir = $(includedir)/openthread -dist_openthread_HEADERS = $(openthread_headers) - -include_HEADERS = \ - $(NULL) - -noinst_HEADERS = \ - config.h \ - $(NULL) - -install-headers: install-includeHEADERS - -include $(abs_top_nlbuild_autotools_dir)/automake/post.am diff --git a/include/openthread/platform/Makefile.am b/include/openthread/platform/Makefile.am deleted file mode 100644 index 3441ae49d..000000000 --- a/include/openthread/platform/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (c) 2016, The OpenThread Authors. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -include $(abs_top_nlbuild_autotools_dir)/automake/pre.am - -ot_platform_headers = \ - alarm-micro.h \ - alarm-milli.h \ - ble.h \ - diag.h \ - flash.h \ - entropy.h \ - memory.h \ - misc.h \ - logging.h \ - otns.h \ - radio.h \ - time.h \ - uart.h \ - udp.h \ - spi-slave.h \ - settings.h \ - messagepool.h \ - toolchain.h \ - $(NULL) - -noinst_HEADERS = \ - debug_uart.h - -ot_platformdir = $(includedir)/openthread/platform -dist_ot_platform_HEADERS = $(ot_platform_headers) - -install-headers: install-includeHEADERS - -include $(abs_top_nlbuild_autotools_dir)/automake/post.am diff --git a/script/check-api-version b/script/check-api-version index 351d14455..8bfe28d12 100755 --- a/script/check-api-version +++ b/script/check-api-version @@ -46,12 +46,12 @@ main() git fetch --depth 1 origin "${OT_SHA_OLD}" - if git diff --quiet "${OT_SHA_OLD}" -- include; then + if git diff --name-only "${OT_SHA_OLD}" -- include/openthread; then echo 'No OpenThread public APIs updates.' exit 0 fi - git diff "${OT_SHA_OLD}" -- include | tee >(cat >&2) | grep -aP '[-+]#define OPENTHREAD_API_VERSION (.+)' >"${OT_VERSIONS_FILE}" || die 'Version number is not updated!' + git diff "${OT_SHA_OLD}" -- include/openthread | tee >(cat >&2) | grep -aP '[-+]#define OPENTHREAD_API_VERSION (.+)' >"${OT_VERSIONS_FILE}" || die 'Version number is not updated!' [[ $(wc -l <"${OT_VERSIONS_FILE}") == 2 ]] || die 'Multiple OPENTHREAD_API_VERSION definitions found!'