riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #940 from Kijewski/issue-926

Browse Source 
make: Add DEFAULT_MODULE and DISABLE_MODULE
This commit is contained in:
Ludwig Ortmann 2014-04-02 14:46:24 +02:00
commit c0846fde22
34 changed files with 102 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.defaultmodules Normal file
View File

@ -0,0 +1,3 @@
DEFAULT_MODULE += cpu core sys
DEFAULT_MODULE += auto_init

5
Makefile.include
View File

@ -48,6 +48,11 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
include $(RIOTBASE)/Makefile.dep include $(RIOTBASE)/Makefile.dep
# Test if there where dependencies against a module in DISABLE_MODULE.
ifneq (, $(filter $(DISABLE_MODULE), $(USEMODULE)))
$(error "Required modules were disabled using DISABLE_MODULE: $(sort $(filter $(DISABLE_MODULE), $(USEMODULE)))")
endif
# Test if the input language was specified externally. # Test if the input language was specified externally.
# Otherwise test if the compiler unterstands the "-std=gnu99" flag, and use it if so. # Otherwise test if the compiler unterstands the "-std=gnu99" flag, and use it if so.
# Otherwise test if the compiler unterstands the "-std=c99" flag, and use it if so. # Otherwise test if the compiler unterstands the "-std=c99" flag, and use it if so.

4
Makefile.modules
View File

@ -1,8 +1,10 @@
UNDEF += $(BINDIR)startup.o UNDEF += $(BINDIR)startup.o
include $(RIOTBASE)/Makefile.pseudomodules include $(RIOTBASE)/Makefile.pseudomodules
include $(RIOTBASE)/Makefile.defaultmodules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
USEMODULE += cpu core sys
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
ED = $(USEMODULE:%=-DMODULE_%) ED = $(USEMODULE:%=-DMODULE_%)
ED += $(USEPKG:%=-DMODULE_%) ED += $(USEPKG:%=-DMODULE_%)

1
examples/ccn-lite-client/Makefile
View File

@ -34,7 +34,6 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += posix USEMODULE += posix
USEMODULE += ps USEMODULE += ps
USEMODULE += auto_init
USEMODULE += random USEMODULE += random
USEMODULE += transceiver USEMODULE += transceiver
ifeq ($(BOARD),msba2) ifeq ($(BOARD),msba2)

3
examples/ccn-lite-relay/Makefile
View File

@ -31,9 +31,6 @@ export QUIET ?= 1
USEMODULE += config USEMODULE += config
USEMODULE += posix USEMODULE += posix
USEMODULE += auto_init
USEMODULE += auto_init
USEMODULE += transceiver USEMODULE += transceiver
ifeq ($(BOARD),msba2) ifeq ($(BOARD),msba2)

1
examples/default/Makefile
View File

@ -34,7 +34,6 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += ps USEMODULE += ps
USEMODULE += vtimer USEMODULE += vtimer
USEMODULE += auto_init
USEMODULE += defaulttransceiver USEMODULE += defaulttransceiver
ifneq (,$(filter msb-430,$(BOARD))) ifneq (,$(filter msb-430,$(BOARD)))

1
examples/rpl_udp/Makefile
View File

@ -36,7 +36,6 @@ endif
# Modules to include: # Modules to include:
USEMODULE += auto_init
USEMODULE += shell USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += posix USEMODULE += posix

2
tests/test_bloom/Makefile
View File

@ -12,6 +12,8 @@ USEMODULE += bloom
export PROJDEPS = sets.h export PROJDEPS = sets.h
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include
sets.h: generate_sets.py words.txt.gz sets.h: generate_sets.py words.txt.gz

2
tests/test_bloom_bytes/Makefile
View File

@ -9,5 +9,7 @@ USEMODULE += hashes
USEMODULE += bloom USEMODULE += bloom
USEMODULE += random USEMODULE += random
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include
endif endif

6
tests/test_disable_module/Makefile Normal file
View File

@ -0,0 +1,6 @@
export PROJECT = test_disable_module
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include

45
tests/test_disable_module/main.c Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright (C) 2014 René Kijewski <rene.kijewski@fu-berlin.de>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @ingroup tests
* @{
*
* @file
* @brief Test whether DISABLE_MODULE works.
*
* @author René Kijewski <rene.kijewski@fu-berlin.de>
*
* @}
*/
#include <stdio.h>
int main(void)
{
puts("Start.");
# ifdef MODULE_AUTO_INIT
puts("-ERROR: MODULE_AUTO_INIT present!");
# else
puts("+OK: MODULE_AUTO_INIT absent.");
# endif
puts("Done.");
return 0;
}

2
tests/test_float/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_float export PROJECT = test_float
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_hwtimer/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_hwtimer export PROJECT = test_hwtimer
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_hwtimer_spin/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_hwtimer_spin export PROJECT = test_hwtimer_spin
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

1
tests/test_irq/Makefile
View File

@ -5,7 +5,6 @@ ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported include $(RIOTBASE)/Makefile.unsupported
else else
USEMODULE += auto_init
USEMODULE += posix USEMODULE += posix
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_mutex_unlock_and_sleep/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_mutex_unlock_and_sleep export PROJECT = test_mutex_unlock_and_sleep
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

1
tests/test_nativenet/Makefile
View File

@ -5,7 +5,6 @@ ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported include $(RIOTBASE)/Makefile.unsupported
else else
USEMODULE += auto_init
USEMODULE += nativenet USEMODULE += nativenet
USEMODULE += transceiver USEMODULE += transceiver

1
tests/test_net_if/Makefile
View File

@ -8,7 +8,6 @@ ifeq ($(BOARD),stm32f4discovery)
include Makefile.$(BOARD) include Makefile.$(BOARD)
endif endif
USEMODULE += auto_init
USEMODULE += net_if USEMODULE += net_if
USEMODULE += defaulttransceiver USEMODULE += defaulttransceiver

1
tests/test_pnet/Makefile
View File

@ -1,7 +1,6 @@
export PROJECT = test_pnet export PROJECT = test_pnet
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += auto_init
USEMODULE += posix USEMODULE += posix
USEMODULE += pnet USEMODULE += pnet
USEMODULE += vtimer USEMODULE += vtimer

2
tests/test_posix_semaphore/Makefile
View File

@ -3,6 +3,6 @@ include ../Makefile.tests_common
USEMODULE += posix USEMODULE += posix
export INCLUDES += -I$(RIOTBASE)/sys/posix/include DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_posix_sleep/Makefile
View File

@ -3,4 +3,6 @@ include ../Makefile.tests_common
USEMODULE += posix USEMODULE += posix
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_pthread/Makefile
View File

@ -4,4 +4,6 @@ include ../Makefile.tests_common
USEMODULE += posix USEMODULE += posix
USEMODULE += pthread USEMODULE += pthread
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_pthread_cooperation/Makefile
View File

@ -4,4 +4,6 @@ include ../Makefile.tests_common
USEMODULE += posix USEMODULE += posix
USEMODULE += pthread USEMODULE += pthread
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_queue_fairness/Makefile
View File

@ -3,4 +3,6 @@ include ../Makefile.tests_common
USEMODULE += vtimer USEMODULE += vtimer
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_sha256/Makefile
View File

@ -3,4 +3,6 @@ include ../Makefile.tests_common
USEMODULE += crypto_sha256 USEMODULE += crypto_sha256
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_shell/Makefile
View File

@ -6,4 +6,6 @@ USEMODULE += shell_commands
USEMODULE += ps USEMODULE += ps
USEMODULE += posix USEMODULE += posix
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_basic/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_basic export PROJECT = test_thread_basic
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_cooperation/Makefile
View File

@ -1,5 +1,7 @@
export PROJECT = test_thread_cooperation export PROJECT = test_thread_cooperation
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_exit/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_exit export PROJECT = test_thread_exit
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_msg/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_msg export PROJECT = test_thread_msg
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_msg_block_w_queue/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_msg_block_w_queue export PROJECT = test_thread_msg_block_w_queue
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_msg_block_wo_queue/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_msg_block_wo_queue export PROJECT = test_thread_msg_block_wo_queue
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/test_thread_msg_seq/Makefile
View File

@ -1,4 +1,6 @@
export PROJECT = test_thread_msg_seq export PROJECT = test_thread_msg_seq
include ../Makefile.tests_common include ../Makefile.tests_common
DISABLE_MODULE += auto_init
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

1
tests/test_vtimer_msg/Makefile
View File

@ -1,7 +1,6 @@
export PROJECT = test_vtimer_msg export PROJECT = test_vtimer_msg
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += auto_init
USEMODULE += vtimer USEMODULE += vtimer
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include