MT#55831 Fix module exclusion logic

Fix module exclusion logic
Several of the modules cannot be compiled because they miss Makefiles,
others require additional dependencies or similar. So encode this in the
build system so that people building do not have to figure this out, even
if they pass an explicit list of modules to include or exclude.

(real ticket number: TT#6850)

Change-Id: Icb52a6f62cd0db97460fc5b0771922bdd46e1f6f
mr11.2.1
Guillem Jover 4 years ago committed by Donat Zenichev
parent fa45b4433e
commit d3f89d46da

@ -1,7 +1,7 @@
COREPATH ?= ../core
.DEFAULT_GOAL := all
local_exclude_app_modules=$(exclude_app_modules)
local_exclude_app_modules=confpin early_dbprompt mobile_push py_sems gateway twit
include $(COREPATH)/../Makefile.defs
@ -12,28 +12,22 @@ include $(COREPATH)/../Makefile.defs
# make $(app_modules)
# else
# if exclude_app_modules is set
# make * - $(exclude_app_modules)
# make * - $(exclude_app_modules) + local excludes
# else
# make * - Makefile.defs:exclude_app_modules + local excludes
#
ifneq ($(app_modules),)
app_modules = $(app_modules)
else
ifneq ($(local_exclude_app_modules),)
exclude_app_modules = $(local_exclude_app_modules)
else
exclude_app_modules += mp3 examples py_sems gateway jsonrpc twit db_reg_agent
ifneq ($(USE_MONITORING), yes)
exclude_app_modules += monitoring
endif
ifeq ($(app_modules),)
exclude_modules = $(exclude_app_modules)
exclude_modules += $(local_exclude_app_modules)
ifneq ($(USE_MONITORING), yes)
exclude_modules += monitoring
endif
$(info local_exclude_app_modules: $(local_exclude_app_modules))
$(info exclude_app_modules: $(exclude_app_modules))
app_modules = $(filter-out $(subst ;, ,$(exclude_app_modules))\
app_modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
$(wildcard Makefile*) CVS CMakeLists.txt, \
$(wildcard *) examples/tutorial/cc_acc )

@ -3,7 +3,7 @@ COREPATH ?= ../../core
include $(COREPATH)/../Makefile.defs
exclude_modules ?=
exclude_modules = ivr_examples
modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
$(wildcard Makefile*) $(wildcard Readme*) CVS, \
$(wildcard *) )

Loading…
Cancel
Save