Merge pull request #586 from openweave/user/gerickson/use-configure-cache

Leverage the Configuration Cache to Speed up the Configuration Phase of the Build

Author: gerickson

.travis/script.sh

@@ -60,11 +60,11 @@ gcc_check_happy()
 case "${BUILD_TARGET}" in
 
     linux-auto-clang)
-        ./configure && make && make check
+        ./configure -C && make && make check
         ;;
 
     linux-auto-gcc-check)
-        ./configure --enable-coverage && make && make check
+        ./configure -C --enable-coverage && make && make check
         ;;
 
     linux-auto-gcc-check-happy)
@@ -76,13 +76,13 @@ case "${BUILD_TARGET}" in
         ;;
 
     linux-lwip-clang)
-        ./configure --with-target-network=lwip --with-lwip=internal --disable-java && make
+        ./configure -C --with-target-network=lwip --with-lwip=internal --disable-java && make
         ;;
 
     linux-lwip-gcc-check)
         # Note, LwIP requires sudo prior to running 'make check' to ensure the appropriate TUN and bridge interfaces
         # may be created.
-        ./configure --enable-coverage --with-target-network=lwip --with-lwip=internal --disable-java && make && sudo make check
+        ./configure -C --enable-coverage --with-target-network=lwip --with-lwip=internal --disable-java && make && sudo make check
         ;;
 
     osx-auto-clang)
@@ -102,11 +102,11 @@ case "${BUILD_TARGET}" in
         ;;
 
     linux-auto-*-distcheck)
-        ./configure && make distcheck
+        ./configure -C && make distcheck
         ;;
 
     linux-auto-*-lint)
-        ./configure && make pretty-check
+        ./configure -C && make pretty-check
         ;;
 
     *)

Makefile-Android

@@ -1,4 +1,5 @@
 #
+#    Copyright (c) Project openweave-core Authors
 #    Copyright (c) 2014-2017 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -259,7 +260,7 @@ AMFILES = src/system/SystemLayer.am			\
 #
 define configure-action
 $(ECHO) "  CONFIG   $(ABI_CONFIG_TUPLE_$(1))..."
-(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure \
+(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure -C \
 CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
 INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
 CPPFLAGS="$(CPPFLAGS)" \

Makefile-Standalone

@@ -1,4 +1,5 @@
 #
+#    Copyright (c) Project openweave-core Authors
 #    Copyright (c) 2014-2017 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -319,7 +320,7 @@ AMFILES = src/system/SystemLayer.am			\
 #
 define configure-target
 $(ECHO) "  CONFIG   $(1)..."
-(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure \
+(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure -C \
 INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
 --prefix=/ \
 --exec-prefix=/$(1) \

Makefile-iOS

@@ -1,4 +1,5 @@
 #
+#    Copyright (c) Project openweave-core Authors
 #    Copyright (c) 2014-2017 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -279,7 +280,7 @@ AMFILES = src/system/SystemLayer.am			\
 #
 define configure-arch
 $(ECHO) "  CONFIG   $(1)-$(TargetTuple)..."
-(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure \
+(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure -C \
 CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
 INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
 CPPFLAGS="$(CPPFLAGS)" \

build/efr32/efr32-openweave.mk

@@ -1,4 +1,5 @@
 #
+#   Copyright (c) Project openweave-core Authors
 #   Copyright (c) 2019 Google LLC.
 #   All rights reserved.
 #
@@ -197,7 +198,7 @@ define OpenWeaveBuildRules
 .PHONY : config-weave .check-config-weave build-weave install-weave clean-weave
 
 .check-config-weave : | $(OPENWEAVE_OUTPUT_DIR)
-	$(NO_ECHO)echo $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_CONFIGURE_OPTIONS) > $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp; \
+	$(NO_ECHO)echo $(OPENWEAVE_ROOT)/configure -C $(OPENWEAVE_CONFIGURE_OPTIONS) > $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp; \
 	(test -r $(OPENWEAVE_OUTPUT_DIR)/config.args && cmp -s $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp $(OPENWEAVE_OUTPUT_DIR)/config.args) || \
 	    mv $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp $(OPENWEAVE_OUTPUT_DIR)/config.args; \
 	 rm -f $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp;
@@ -211,7 +212,7 @@ $(OPENWEAVE_ROOT)/configure : $(OPENWEAVE_ROOT)/configure.ac
 
 $(OPENWEAVE_OUTPUT_DIR)/config.status : $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_OUTPUT_DIR)/config.args
 	@echo "$(HDR_PREFIX)CONFIGURE OPENWEAVE..."
-	$(NO_ECHO)(cd $(OPENWEAVE_OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_CONFIGURE_OPTIONS))
+	$(NO_ECHO)(cd $(OPENWEAVE_OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure -C $(OPENWEAVE_CONFIGURE_OPTIONS))
 
 config-weave : $(OPENWEAVE_OUTPUT_DIR)/config.status | $(OPENTHREAD_PREREQUISITE)
 

build/esp32/components/openweave/component.mk

@@ -1,4 +1,5 @@
 #
+#    Copyright (c) Project openweave-core Authors
 #    Copyright (c) 2018 Nest Labs, Inc.
 #    All rights reserved.
 #
@@ -144,7 +145,7 @@ COMPONENT_OWNCLEANTARGET 	 = 1
 
 .PHONY : check-config-args-updated
 check-config-args-updated : | $(OUTPUT_DIR)
-	echo $(OPENWEAVE_ROOT)/configure $(CONFIGURE_OPTIONS) > $(OUTPUT_DIR)/config.args.tmp; \
+	echo $(OPENWEAVE_ROOT)/configure -C $(CONFIGURE_OPTIONS) > $(OUTPUT_DIR)/config.args.tmp; \
 	(test -r $(OUTPUT_DIR)/config.args && cmp -s $(OUTPUT_DIR)/config.args.tmp $(OUTPUT_DIR)/config.args) || \
 	    mv $(OUTPUT_DIR)/config.args.tmp $(OUTPUT_DIR)/config.args; \
 	rm -f $(OUTPUT_DIR)/config.args.tmp;
@@ -158,7 +159,7 @@ $(OPENWEAVE_ROOT)/configure : $(OPENWEAVE_ROOT)/configure.ac
 
 $(OUTPUT_DIR)/config.status : $(OPENWEAVE_ROOT)/configure $(OUTPUT_DIR)/config.args
 	echo "CONFIGURE OPENWEAVE..."
-	(cd $(OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure $(CONFIGURE_OPTIONS))
+	(cd $(OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure -C $(CONFIGURE_OPTIONS))
 
 configure-weave : $(OUTPUT_DIR)/config.status
 

build/nrf5/nrf5-openweave.mk

@@ -1,4 +1,5 @@
 #
+#   Copyright (c) Project openweave-core Authors
 #   Copyright (c) 2019 Google LLC.
 #   All rights reserved.
 #
@@ -186,7 +187,7 @@ define OpenWeaveBuildRules
 .PHONY : config-weave .check-config-weave build-weave install-weave clean-weave
 
 .check-config-weave : | $(OPENWEAVE_OUTPUT_DIR)
-	$(NO_ECHO)echo $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_CONFIGURE_OPTIONS) > $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp; \
+	$(NO_ECHO)echo $(OPENWEAVE_ROOT)/configure -C $(OPENWEAVE_CONFIGURE_OPTIONS) > $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp; \
 	(test -r $(OPENWEAVE_OUTPUT_DIR)/config.args && cmp -s $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp $(OPENWEAVE_OUTPUT_DIR)/config.args) || \
 	    mv $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp $(OPENWEAVE_OUTPUT_DIR)/config.args; \
 	 rm -f $(OPENWEAVE_OUTPUT_DIR)/config.args.tmp;
@@ -200,7 +201,7 @@ $(OPENWEAVE_ROOT)/configure : $(OPENWEAVE_ROOT)/configure.ac
 
 $(OPENWEAVE_OUTPUT_DIR)/config.status : $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_OUTPUT_DIR)/config.args
 	@echo "$(HDR_PREFIX)CONFIGURE OPENWEAVE..."
-	$(NO_ECHO)(cd $(OPENWEAVE_OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure $(OPENWEAVE_CONFIGURE_OPTIONS))
+	$(NO_ECHO)(cd $(OPENWEAVE_OUTPUT_DIR) && $(OPENWEAVE_ROOT)/configure -C $(OPENWEAVE_CONFIGURE_OPTIONS))
 
 config-weave : $(OPENWEAVE_OUTPUT_DIR)/config.status | $(OPENTHREAD_PREREQUISITE)