sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: parallel clean and distclean subdir build

Browse Source 
Use absolute path for APPDIR which could be used by apps clean
and distclean subdir build. Parallel clean and distclean subdir
could save more build time.

Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao 2020-05-22 08:36:20 +08:00 committed by Abdelatif Guettouche
parent 287b9f9c38
commit adc0c3e459
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/Config.mk
View File

@ -430,3 +430,16 @@ define TESTANDREPLACEFILE
fi fi
endef endef
endif endif
# Invoke make
define MAKE_template
+$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef
define SDIR_template
$(1)_$(2):
+$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef

26
tools/Makefile.unix
View File

@ -85,7 +85,7 @@ COMMON_DIR = $(if $(wildcard $(BOARD_DIR)/common/Makefile),y,)
ifeq ($(CONFIG_APPS_DIR),) ifeq ($(CONFIG_APPS_DIR),)
CONFIG_APPS_DIR = ../apps CONFIG_APPS_DIR = ../apps
endif endif
APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi} APPDIR := $(realpath ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi})
# CONTEXTDIRS include directories that have special, one-time pre-build # CONTEXTDIRS include directories that have special, one-time pre-build
# requirements. Normally this includes things like auto-generation of # requirements. Normally this includes things like auto-generation of
@ -544,12 +544,9 @@ export: $(NUTTXLIBS)
depend: pass1dep pass2dep depend: pass1dep pass2dep
subdir_clean: $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(Q) for dir in $(CLEANDIRS) ; do \
if [ -e $$dir/Makefile ]; then \ subdir_clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean ; \
fi \
done
$(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean
ifeq ($(CONFIG_BUILD_2PASS),y) ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean
@ -567,12 +564,9 @@ clean: subdir_clean
$(call DELFILE, uImage) $(call DELFILE, uImage)
$(call CLEAN) $(call CLEAN)
subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
$(Q) for dir in $(CLEANDIRS) ; do \
if [ -e $$dir/Makefile ]; then \ subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" distclean ; \
fi \
done
distclean: clean subdir_distclean clean_context distclean: clean subdir_distclean clean_context
ifeq ($(CONFIG_BUILD_2PASS),y) ifeq ($(CONFIG_BUILD_2PASS),y)
@ -611,15 +605,15 @@ endif
apps_preconfig: apps_preconfig:
ifneq ($(APPDIR),) ifneq ($(APPDIR),)
$(Q) $(MAKE) -C "$(TOPDIR)/$(APPDIR)" TOPDIR="$(TOPDIR)" preconfig $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" preconfig
endif endif
apps_clean: apps_clean:
ifneq ($(APPDIR),) ifneq ($(APPDIR),)
$(Q) $(MAKE) -C "$(TOPDIR)/$(APPDIR)" TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" clean
endif endif
apps_distclean: apps_distclean:
ifneq ($(APPDIR),) ifneq ($(APPDIR),)
$(Q) $(MAKE) -C "$(TOPDIR)/$(APPDIR)" TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" distclean
endif endif

12
tools/Makefile.win
View File

@ -73,7 +73,7 @@ COMMON_DIR = $(if $(wildcard $(BOARD_DIR)$(DELIM)common$(DELIM)Makefile),y,)
ifeq ($(CONFIG_APPS_DIR),) ifeq ($(CONFIG_APPS_DIR),)
CONFIG_APPS_DIR = ..\apps CONFIG_APPS_DIR = ..\apps
endif endif
APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR)} APPDIR := $(realpath ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR)})
# CONTEXTDIRS include directories that have special, one-time pre-build # CONTEXTDIRS include directories that have special, one-time pre-build
# requirements. Normally this includes things like auto-generation of # requirements. Normally this includes things like auto-generation of
@ -497,8 +497,9 @@ export: ${NUTTXLIBS}
depend: pass1dep pass2dep depend: pass1dep pass2dep
subdir_clean: $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G\Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" clean )
subdir_clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
$(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean
ifeq ($(CONFIG_BUILD_2PASS),y) ifeq ($(CONFIG_BUILD_2PASS),y)
$(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean
@ -516,8 +517,9 @@ clean: subdir_clean
$(call DELFILE, uImage) $(call DELFILE, uImage)
$(call CLEAN) $(call CLEAN)
subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
$(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G\Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" distclean )
subdir_distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
distclean: clean subdir_distclean clean_context distclean: clean subdir_distclean clean_context
ifeq ($(CONFIG_BUILD_2PASS),y) ifeq ($(CONFIG_BUILD_2PASS),y)