update qcloud sdk

1. iot-hub sdk update to 3.2.0 2. iot-explorer update to 3.1.1
2020-05-07 11:11:04 +08:00
parent c8e39739d3
commit 3e631cd96a
594 changed files with 47287 additions and 44165 deletions
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/internal_make_funcs.mk
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/internal_make_funcs.mk
@@ -0,0 +1,120 @@
+define CompLib_Map
+$(eval \
+    COMP_LIB_COMPONENTS += \
+        $(if \
+            $(filter y,$(FEATURE_$(strip $(1)))),$(strip $(2)) \
+        ) \
+)
+endef
+
+define CompInc_Map
+$(eval \
+    COMP_LIB_COMPONENTS_INCLUDES += \
+        $(if \
+            $(filter y,$(FEATURE_$(strip $(1)))),$(strip $(2)) \
+        ) \
+)
+endef
+
+# 31, red. 32, green. 33, yellow. 34, blue. 35, magenta. 36, cyan. 37, white.
+define Brief_Log
+	@if [ "$1" = "CC" ]; then \
+	    if echo "$@"|grep -q "\.so$$"; then \
+	        COLOR_MARK="\e[1;32m"; \
+	    elif echo "$@"|grep -q "\.ko$$"; then \
+	        COLOR_MARK="\e[1;35m"; \
+	    else \
+	        COLOR_MARK="\e[1;36m"; \
+	    fi \
+	elif [ "$1" = "AR" ]; then \
+	    COLOR_MARK="\e[1;33m"; \
+	elif [ "$1" = "LD" ]; then \
+	    COLOR_MARK="\e[1;31m"; \
+	fi; \
+	echo -ne "$${COLOR_MARK}";
+
+	@if [ "$2" = "" ]; then \
+	    FIRST_DEP="$(firstword $(filter-out FORCE,$?))"; \
+	    SPACE_BAR="                                   "; \
+	    if [ "$${FIRST_DEP}" != "" ]; then \
+	        FIRST_DEP="$$(basename $${FIRST_DEP})"; \
+	    fi; \
+	    printf "\r%-40s%s\n" "[$1] $$(expr substr $$(basename $@) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	else \
+	    printf "\r%-40s%s\n" "[$1] $$(expr substr $(2) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	fi
+
+	@for i in $(wordlist 2,100,$^); do \
+	    printf "%-40s%s\n" "" "   $$(basename $${i})"; \
+	done
+	@echo -ne "\e[0m"
+endef
+
+define CC_Log
+	@if [ "$2" = "" ]; then \
+	    FIRST_DEP="$(firstword $(filter-out FORCE,$?))"; \
+	    SPACE_BAR="                                   "; \
+	    if [ "$${FIRST_DEP}" != "" ]; then \
+	        FIRST_DEP="$$(basename $${FIRST_DEP})"; \
+	    fi; \
+	    printf "\r%-40s%s\n" "[CC] $$(expr substr $$(basename $@) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	else \
+	    printf "\r%-40s%s\n" "[CC] $$(expr substr $(2) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	fi
+
+	@for i in $(wordlist 2,100,$^); do \
+	    printf "%-40s%s\n" "" "   $$(basename $${i})"; \
+	done
+endef
+
+define AR_Log
+	@if [ "$2" = "" ]; then \
+	    FIRST_DEP="$(firstword $(filter-out FORCE,$?))"; \
+	    SPACE_BAR="                                   "; \
+	    if [ "$${FIRST_DEP}" != "" ]; then \
+	        FIRST_DEP="$$(basename $${FIRST_DEP})"; \
+	    fi; \
+	    printf "\r%-40s%s\n" "[AR] $$(expr substr $$(basename $@) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	else \
+	    printf "\r%-40s%s\n" "[AR] $$(expr substr $(2) 1 30)" "<= $${FIRST_DEP} $${SPACE_BAR}"; \
+	fi
+
+	@for i in $(wordlist 2,100,$^); do \
+	    printf "%-40s%s\n" "" "   $$(basename $${i})"; \
+	done
+endef
+
+define Compile_Result
+    @echo ""
+    @echo "========================================================================="
+    @echo "o BUILD COMPLETE WITH FOLLOWING CONFIGS:"
+    @echo "----"
+    @( \
+    $(foreach V,$(SWITCH_VARS), \
+        $(if $(findstring FEATURE_,$(V)), \
+            printf "%-36s : %-s\n" "    $(V)" "$($(V))"; \
+        ) \
+    ) )
+
+    @echo ""
+    @echo "o RELEASE PACKAGE LAYOUT:"
+    @echo "----"
+    @cd $(FINAL_DIR) && echo -n "    " && pwd && echo "" && \
+     find . -print | awk '!/\.$$/ { \
+        for (i = 1; i < NF-1; i++) { \
+            printf("|   "); \
+        } \
+        print "+-- "$$NF}' FS='/' | sed 's!\(.*\)!    &!g'
+    @echo ""
+
+    @echo "o BINARY FOOTPRINT CONSIST:"
+    @echo "----"
+    @chmod a+x $(SCRIPT_DIR)/stats_static_lib.sh
+    @$(SCRIPT_DIR)/stats_static_lib.sh $(FINAL_DIR)/lib/$(COMP_LIB)
+    @$(SCRIPT_DIR)/stats_static_lib.sh $(FINAL_DIR)/lib/$(PLATFORM_LIB)
+
+    @echo "========================================================================="
+    @echo ""
+endef
+
+
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/parse_make_settings.mk
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/parse_make_settings.mk
@@ -0,0 +1,103 @@
+include $(SCRIPT_DIR)/internal_make_funcs.mk
+
+SETTING_VARS := \
+    BUILD_TYPE \
+    PLATFORM_CC \
+    PLATFORM_AR \
+    PLATFORM_OS \
+
+SWITCH_VARS := \
+    FEATURE_MQTT_COMM_ENABLED \
+    FEATURE_COAP_COMM_ENABLED \
+    FEATURE_OTA_COMM_ENABLED \
+    FEATURE_MQTT_DEVICE_SHADOW \
+    FEATURE_AUTH_WITH_NOTLS \
+    FEATURE_GATEWAY_ENABLED \
+    FEATURE_LOG_UPLOAD_ENABLED \
+    FEATURE_MULTITHREAD_ENABLED \
+	FEATURE_DEV_DYN_REG_ENABLED \
+    FEATURE_AT_TCP_ENABLED \
+    FEATURE_AT_UART_RECV_IRQ \
+    FEATURE_AT_OS_USED \
+    FEATURE_AT_DEBUG \
+    FEATURE_DEBUG_DEV_INFO_USED \
+    FEATURE_OTA_USE_HTTPS \
+    
+$(foreach v, \
+    $(SETTING_VARS) $(SWITCH_VARS), \
+    $(eval export $(v)=$($(v))) \
+)
+
+$(foreach v, \
+    $(SWITCH_VARS), \
+    $(if $(filter y,$($(v))), \
+        $(eval CFLAGS += -D$(subst FEATURE_,,$(v)))) \
+)
+
+
+ifeq (debug,$(strip $(BUILD_TYPE)))
+CFLAGS  += -DIOT_DEBUG -g -O2
+endif
+
+ifneq (linux,$(strip $(PLATFORM_OS)))
+ifeq (y,$(strip $(FEATURE_SDKTESTS_ENABLED)))
+$(error FEATURE_SDKTESTS_ENABLED with gtest framework just supports to be enabled on PLATFORM_OS = linux!)
+endif
+else
+ifeq (y,$(strip $(FEATURE_SDKTESTS_ENABLED)))
+CFLAGS += -DSDKTESTS_ENABLED
+endif
+endif
+
+ifeq (y,$(strip $(FEATURE_OTA_COMM_ENABLED)))
+ifeq (MQTT,$(strip $(FEATURE_OTA_SIGNAL_CHANNEL)))
+ifneq (y,$(strip $(FEATURE_MQTT_COMM_ENABLED)))
+$(error FEATURE_OTA_SIGNAL_CHANNEL = MQTT requires FEATURE_MQTT_COMM_ENABLED = y!)
+endif
+CFLAGS += -DOTA_MQTT_CHANNEL
+else
+ifeq (COAP,$(strip $(FEATURE_OTA_SIGNAL_CHANNEL)))
+ifneq (y,$(strip $(FEATURE_COAP_COMM_ENABLED)))
+$(error FEATURE_OTA_SIGNAL_CHANNEL = COAP requires FEATURE_COAP_COMM_ENABLED = y!)
+endif
+CFLAGS += -DOTA_COAP_CHANNEL
+else
+$(error FEATURE_OTA_SIGNAL_CHANNEL must be MQTT or COAP!)
+endif # COAP
+endif # MQTT
+endif # OTA Enabled
+
+ifeq (CERT,$(strip $(FEATURE_AUTH_MODE)))
+ifeq (y,$(strip $(FEATURE_AUTH_WITH_NOTLS)))
+$(error FEATURE_AUTH_MODE = CERT requires FEATURE_AUTH_WITH_NOTLS = n!)
+endif
+CFLAGS += -DAUTH_MODE_CERT
+else
+ifeq (KEY,$(strip $(FEATURE_AUTH_MODE)))
+CFLAGS += -DAUTH_MODE_KEY
+else
+$(error FEATURE_AUTH_MODE must be CERT or KEY!)
+endif
+endif # Auth mode
+
+ifeq (y, $(strip $(FEATURE_SYSTEM_COMM_ENABLED)))
+CFLAGS += -DSYSTEM_COMM
+endif
+
+ifeq (y, $(strip $(FEATURE_LOG_UPLOAD_ENABLED)))
+CFLAGS += -DLOG_UPLOAD
+endif
+
+ifeq (y, $(strip $(FEATURE_AT_TCP_ENABLED)))
+CFLAGS += -DAT_TCP_ENABLED
+ifeq (y, $(strip $(FEATURE_AT_UART_RECV_IRQ)))
+CFLAGS += -DAT_UART_RECV_IRQ
+endif
+ifeq (y, $(strip $(FEATURE_AT_OS_USED)))
+CFLAGS += -DAT_OS_USED
+endif
+ifeq (y, $(strip $(FEATURE_AT_DEBUG)))
+CFLAGS += -DFEATURE_AT_DEBUG
+endif
+endif
+
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/rules-tests.mk
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/rules-tests.mk
@@ -0,0 +1,5 @@
+.PHONY: run_demo_test demo_test_clean run_unit_test run_multi_thread_test \
+        coap_run_demo_test coap_demo_test_clean
+
+tests: run_demo_test run_unit_test run_multi_thread_test coap_run_demo_test
+  
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/rules.mk
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/rules.mk
@@ -0,0 +1,104 @@
+iot_sdk_objects = $(patsubst %.c,%.o, $(IOTSDK_SRC_FILES))
+iot_platform_objects = $(patsubst %.c,%.o, $(IOTPLATFORM_SRC_FILES))
+
+.PHONY: config mbedtls clean final-out samples tests
+
+all: config mbedtls ${COMP_LIB} ${PLATFORM_LIB} final-out samples tests 
+	$(call Compile_Result)
+
+${COMP_LIB}: ${iot_sdk_objects}
+	$(call Brief_Log,"AR")
+	$(TOP_Q) \
+	$(AR) rcs $@ $(iot_sdk_objects)
+	
+	$(TOP_Q) \
+	rm ${iot_sdk_objects}
+	
+${PLATFORM_LIB}: ${iot_platform_objects}
+	$(call Brief_Log,"AR")
+	$(TOP_Q) \
+	$(AR) rcs $@ $(iot_platform_objects)
+	
+	$(TOP_Q) \
+	rm ${iot_platform_objects}
+	
+config:
+	$(TOP_Q) \
+	mkdir -p ${TEMP_DIR}
+	
+mbedtls:
+ifeq (,$(filter -DAUTH_WITH_NOTLS,$(CFLAGS)))
+	$(TOP_Q) \
+	make -s -C $(THIRD_PARTY_PATH)/mbedtls lib -e CC=$(PLATFORM_CC) AR=$(PLATFORM_AR)
+	
+	$(TOP_Q) \
+	cp -RP  $(THIRD_PARTY_PATH)/mbedtls/library/libmbedtls.*  \
+			$(THIRD_PARTY_PATH)/mbedtls/library/libmbedx509.* \
+			$(THIRD_PARTY_PATH)/mbedtls/library/libmbedcrypto.* \
+			$(TEMP_DIR)
+	
+	$(TOP_Q) \
+	cd $(TEMP_DIR) && $(AR) x libmbedtls.a \
+						&& $(AR) x libmbedx509.a \
+						&& $(AR) x libmbedcrypto.a
+endif
+
+${iot_sdk_objects}:%.o:%.c
+	$(TOP_Q) echo '' > $(TOP_DIR)/include/config.h
+	$(call Brief_Log,"CC")
+	$(TOP_Q) \
+	$(PLATFORM_CC) $(CFLAGS) -c $^ -o $@
+	
+${iot_platform_objects}:%.o:%.c
+	$(call Brief_Log,"CC")
+	$(TOP_Q) \
+	$(PLATFORM_CC) $(CFLAGS) -c $^ -o $@
+	
+final-out :
+	$(TOP_Q) \
+	mkdir -p ${FINAL_DIR}  ${DIST_DIR}  ${FINAL_DIR}/lib \
+			 ${FINAL_DIR}/include  ${FINAL_DIR}/bin
+	
+	$(TOP_Q) \
+	mv ${COMP_LIB} ${FINAL_DIR}/lib/ && \
+	mv ${PLATFORM_LIB} ${FINAL_DIR}/lib
+
+	$(TOP_Q) \
+	cp -rf $(TOP_DIR)/include $(FINAL_DIR)/
+
+	$(TOP_Q) \
+	cp -rf $(TOP_DIR)/certs $(FINAL_DIR)/bin/
+	
+ifeq (,$(filter -DAUTH_WITH_NOTLS,$(CFLAGS)))
+	$(TOP_Q) \
+	mv ${TEMP_DIR}/*.a ${FINAL_DIR}/lib/
+endif
+	
+	$(TOP_Q) \
+	rm -rf ${TEMP_DIR}
+
+#include $(SCRIPT_DIR)/rules-tests.mk
+
+samples:
+	$(TOP_Q) \
+	make -s -C $(SAMPLE_DIR)
+
+TLSDIR = $(THIRD_PARTY_PATH)/mbedtls
+clean:
+	$(TOP_Q) \
+	rm -rf ${TEMP_DIR}
+	
+	$(TOP_Q) \
+	rm -rf ${DIST_DIR}
+	
+ifeq (,$(filter -DAUTH_WITH_NOTLS,$(CFLAGS)))
+ifeq ($(TLSDIR), $(wildcard $(THIRD_PARTY_PATH)/mbedtls))
+	$(TOP_Q) \
+	make -s -C $(THIRD_PARTY_PATH)/mbedtls clean
+endif
+endif
+
+ifeq (,$(filter -DSDKTESTS_ENABLED,$(CFLAGS)))
+	$(TOP_Q) \
+	rm -rf $(TEST_LIB_DIR)
+endif
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/stats_static_lib.sh
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/stats_static_lib.sh
@@ -0,0 +1,65 @@
+#! /bin/bash
+
+TARGET=$1
+TEMPD=$(mktemp -d -t STATD-XXXX)
+TEMPF=$(mktemp -t STATF-XXXX)
+
+#echo "TARGET = ${TARGET}"
+#echo "STAGED = ${STAGED}"
+#echo "TEMPD = ${TEMPD}"
+
+if [ ! -f ${TARGET} ] || [ ! -d ${STAGED} ]; then
+    echo "Invalid Env"
+    exit 1
+fi
+
+cp ${TARGET} ${TEMPD}
+cd ${TEMPD}
+ar xf $(basename ${TARGET})
+rm -f $(basename ${TARGET})
+${STRIP} *.o > /dev/null 2>&1
+
+NAME=$1
+for obj in $(ls *.o); do
+    dir=$(find ${STAGED} -name ${obj}|xargs dirname|xargs basename)
+    printf "%-12s %-32s %s\n" $(basename $1) ${obj} $(du -b ${obj}|awk '{ print $1 }')
+done | sort > ${TEMPF}
+
+MODS=$(cat ${TEMPF}|awk '{ print $1 }'|sort -u)
+
+TOTAL=$(cat ${TEMPF}|awk '{ sum += $3 } END { print sum }')
+# echo "TOTAL = ${TOTAL}"
+
+SMODS=$( \
+for mod in ${MODS}; do \
+    MSIZE=$(grep "^${mod}" ${TEMPF}|awk '{ sum += $3 } END { print sum }'); \
+    printf "%-8s %s\n" \
+        $(awk -v a=${MSIZE} -v b=${TOTAL} 'BEGIN { printf("%.2f%%\n", a/b*100); }') \
+        "${mod}"; \
+done | sort -nr | awk '{ print $2 }' \
+)
+
+echo ""
+for mod in ${SMODS}; do
+    MSIZE=$(grep "^${mod}" ${TEMPF}|awk '{ sum += $3 } END { print sum }')
+    OBJS=$(grep "^${mod}" ${TEMPF}|awk '{ print $2 }')
+    for obj in ${OBJS}; do
+        FSIZE=$(grep "\<${obj}\>" ${TEMPF}|awk '{ print $3 }')
+        printf "     %-8s %28s | %-8s %8s %-8s\n" \
+            $(awk -v a=${FSIZE} -v b=${MSIZE} 'BEGIN { printf("%.2f%%\n", a/b*100); }') \
+            "${obj}" "${mod}" "${FSIZE} /" "${MSIZE}"
+    done | sort -nr
+    echo "    -----------------------------------------------------------------"
+done
+
+echo ""
+for mod in ${MODS}; do
+    MSIZE=$(grep "^${mod}" ${TEMPF}|awk '{ sum += $3 } END { print sum }')
+    printf "     %-8s %-12s %16s\n" \
+        $(awk -v a=${MSIZE} -v b=${TOTAL} 'BEGIN { printf("%.2f%%\n", a/b*100); }') \
+        "[ ${mod} ]" "${MSIZE} Bytes"
+done | sort -nr
+
+cd "${OLDPWD}"
+rm -rf ${TEMPD}
+rm -f ${TEMPF}
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/update_gtest.sh
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/update_gtest.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+GOOGLE_TEST="external_libs/googletest"
+
+if [ ! -d ${GOOGLE_TEST} ]; then
+    git clone -q packages/gtest_module.git ${GOOGLE_TEST}
+else
+    cd ${GOOGLE_TEST}
+    git pull -q
+    cd -
+fi
--- a/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/update_mbedtls.sh
+++ b/components/connectivity/qcloud-iot-hub-sdk/3rdparty/tools/build_scripts/update_mbedtls.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+MBEDTLS_DIR="external_libs/mbedtls"
+
+if [ ! -d ${MBEDTLS_DIR} ]; then
+    git clone -q packages/mbedtls_module.git ${MBEDTLS_DIR}
+else
+    cd ${MBEDTLS_DIR}
+    git pull -q
+    cd -
+fi