Recator application build system: cleaner flags naming, set release flag to yes by default, include unit test and debug apps (#443)

1 files changed, 188 insertions, 190 deletions

diff --git a/applications/applications.mk b/applications/applications.mk
index 075031f7..594d9ca3 100644
--- a/applications/applications.mk
+++ b/applications/applications.mk
@@ -6,300 +6,298 @@ C_SOURCES   += $(shell find $(APP_DIR) -name *.c)
 CPP_SOURCES += $(shell find $(APP_DIR) -name *.cpp)
 
 
-# Use APP_* for autostart app
-# Use BUILD_* for add app to build
+# Use SRV_* for autostart app
+# Use APP_* for add app to build
 
-APP_RELEASE ?= 0
+APP_RELEASE ?= 1
 ifeq ($(APP_RELEASE), 1)
+# Main services
+SRV_MENU = 1
+SRV_NFC  = 1
+SRV_POWER = 1
+SRV_BT = 1
+SRV_CLI = 1
+SRV_SD_FILESYSTEM = 1
+SRV_DOLPHIN = 1
+
+# Main Apps
+APP_IRDA  = 1
+APP_SUBGHZ = 1
+APP_LF_RFID = 1
+APP_GPIO_DEMO = 1
+APP_MUSIC_PLAYER = 1
+APP_FLOOPPER_BLOOPPER = 1
+APP_IBUTTON = 1
+
+# Debug and misc
+APP_GUI_TEST = 1
+APP_KEYPAD_TEST = 1
+APP_ACCESSOR = 1
+APP_SD_TEST = 1
+APP_VIBRO_DEMO = 1
+APP_SPEAKER_DEMO = 1
+APP_EXAMPLE_BLINK = 1
+APP_EXAMPLE_UART_WRITE = 1
+APP_EXAMPLE_INPUT_DUMP = 1
+APP_UNIT_TESTS = 1
+endif
+
+SRV_NFC ?= 0
+ifeq ($(SRV_NFC), 1)
+SRV_MENU	= 1
+CFLAGS		+= -DSRV_NFC
+endif
+
+SRV_DOLPHIN ?= 0
+ifeq ($(SRV_DOLPHIN), 1)
+SRV_MENU	= 1
+CFLAGS		+= -DSRV_DOLPHIN
+endif
+
+SRV_POWER ?= 0
+ifeq ($(SRV_POWER), 1)
+SRV_GUI		= 1
+SRV_CLI		= 1
+CFLAGS		+= -DSRV_POWER
+endif
+
+SRV_BT ?= 0
+ifeq ($(SRV_BT), 1)
+SRV_CLI		= 1
+CFLAGS		+= -DSRV_BT
+endif
+
+SRV_MENU ?= 0
+ifeq ($(SRV_MENU), 1)
+CFLAGS += -DSRV_MENU
 APP_MENU = 1
-APP_NFC  = 1
-APP_POWER = 1
-APP_BT = 1
-APP_CLI = 1
-APP_SD_FILESYSTEM = 1
-BUILD_IRDA  = 1
-APP_DOLPHIN = 1
-BUILD_SUBGHZ = 1
-BUILD_LF_RFID = 1
-BUILD_GPIO_DEMO = 1
-BUILD_MUSIC_PLAYER = 1
-BUILD_FLOOPPER_BLOOPPER = 1
-BUILD_IBUTTON = 1
-
-endif
-
-APP_DEBUG ?=0
-ifeq ($(APP_DEBUG), 1)
-CFLAGS		+= -DAPP_DEBUG
-BUILD_GUI_TEST = 1
-BUILD_KEYPAD_TEST = 1
-BUILD_ACCESSOR = 1
-BUILD_SD_TEST = 1
-BUILD_VIBRO_DEMO = 1
-BUILD_SPEAKER_DEMO = 1
-BUILD_EXAMPLE_BLINK = 1
-BUILD_EXAMPLE_UART_WRITE = 1
-BUILD_EXAMPLE_INPUT_DUMP = 1
-endif
-
-
-
-APP_NFC ?= 0
-ifeq ($(APP_NFC), 1)
-APP_MENU	= 1
-CFLAGS		+= -DAPP_NFC
-endif
-
-APP_DOLPHIN ?= 0
-ifeq ($(APP_DOLPHIN), 1)
-APP_MENU	= 1
-CFLAGS		+= -DAPP_DOLPHIN
-endif
-
-APP_POWER ?= 0
-ifeq ($(APP_POWER), 1)
-APP_GUI		= 1
-APP_CLI		= 1
-CFLAGS		+= -DAPP_POWER
-endif
-
-APP_BT ?= 0
-ifeq ($(APP_BT), 1)
-APP_CLI		= 1
-CFLAGS		+= -DAPP_BT
 endif
-
 APP_MENU ?= 0
 ifeq ($(APP_MENU), 1)
-CFLAGS += -DAPP_MENU
-BUILD_MENU = 1
-endif
-BUILD_MENU ?= 0
-ifeq ($(BUILD_MENU), 1)
-APP_INPUT	= 1
-APP_GUI		= 1
-CFLAGS		+= -DBUILD_MENU
+SRV_INPUT	= 1
+SRV_GUI		= 1
+CFLAGS		+= -DAPP_MENU
 endif
 
-APP_TEST	?= 0
-ifeq ($(APP_TEST), 1)
-CFLAGS		+= -DAPP_TEST
+APP_UNIT_TESTS	?= 0
+ifeq ($(APP_UNIT_TESTS), 1)
+CFLAGS		+= -DAPP_UNIT_TESTS
 endif
 
+SRV_EXAMPLE_BLINK ?= 0
+ifeq ($(SRV_EXAMPLE_BLINK), 1)
+CFLAGS		+= -DSRV_EXAMPLE_BLINK
+APP_EXAMPLE_BLINK = 1
+endif
 APP_EXAMPLE_BLINK ?= 0
 ifeq ($(APP_EXAMPLE_BLINK), 1)
 CFLAGS		+= -DAPP_EXAMPLE_BLINK
-BUILD_EXAMPLE_BLINK = 1
-endif
-BUILD_EXAMPLE_BLINK ?= 0
-ifeq ($(BUILD_EXAMPLE_BLINK), 1)
-CFLAGS		+= -DBUILD_EXAMPLE_BLINK
-APP_INPUT = 1
+SRV_INPUT = 1
 endif
 
+SRV_EXAMPLE_UART_WRITE ?= 0
+ifeq ($(SRV_EXAMPLE_UART_WRITE), 1)
+CFLAGS		+= -DSRV_EXAMPLE_UART_WRITE
+APP_EXAMPLE_UART_WRITE = 1
+endif
 APP_EXAMPLE_UART_WRITE ?= 0
 ifeq ($(APP_EXAMPLE_UART_WRITE), 1)
 CFLAGS		+= -DAPP_EXAMPLE_UART_WRITE
-BUILD_EXAMPLE_UART_WRITE = 1
-endif
-BUILD_EXAMPLE_UART_WRITE ?= 0
-ifeq ($(BUILD_EXAMPLE_UART_WRITE), 1)
-CFLAGS		+= -DBUILD_EXAMPLE_UART_WRITE
 endif
 
+SRV_EXAMPLE_IPC ?= 0
+ifeq ($(SRV_EXAMPLE_IPC), 1)
+CFLAGS		+= -DSRV_EXAMPLE_IPC
+APP_EXAMPLE_IPC = 1
+endif
 APP_EXAMPLE_IPC ?= 0
 ifeq ($(APP_EXAMPLE_IPC), 1)
 CFLAGS		+= -DAPP_EXAMPLE_IPC
-BUILD_EXAMPLE_IPC = 1
-endif
-BUILD_EXAMPLE_IPC ?= 0
-ifeq ($(BUILD_EXAMPLE_IPC), 1)
-CFLAGS		+= -DBUILD_EXAMPLE_IPC
 endif
 
+SRV_EXAMPLE_INPUT_DUMP ?= 0
+ifeq ($(SRV_EXAMPLE_INPUT_DUMP), 1)
+CFLAGS		+= -DSRV_EXAMPLE_INPUT_DUMP
+APP_EXAMPLE_INPUT_DUMP = 1
+endif
 APP_EXAMPLE_INPUT_DUMP ?= 0
 ifeq ($(APP_EXAMPLE_INPUT_DUMP), 1)
 CFLAGS		+= -DAPP_EXAMPLE_INPUT_DUMP
-BUILD_EXAMPLE_INPUT_DUMP = 1
-endif
-BUILD_EXAMPLE_INPUT_DUMP ?= 0
-ifeq ($(BUILD_EXAMPLE_INPUT_DUMP), 1)
-CFLAGS		+= -DBUILD_EXAMPLE_INPUT_DUMP
-APP_INPUT = 1
+SRV_INPUT = 1
 endif
 
+SRV_EXAMPLE_QRCODE ?= 0
+ifeq ($(SRV_EXAMPLE_QRCODE), 1)
+CFLAGS		+= -DSRV_EXAMPLE_QRCODE
+APP_EXAMPLE_QRCODE = 1
+endif
 APP_EXAMPLE_QRCODE ?= 0
 ifeq ($(APP_EXAMPLE_QRCODE), 1)
 CFLAGS		+= -DAPP_EXAMPLE_QRCODE
-BUILD_EXAMPLE_QRCODE = 1
-endif
-BUILD_EXAMPLE_QRCODE ?= 0
-ifeq ($(BUILD_EXAMPLE_QRCODE), 1)
-CFLAGS		+= -DBUILD_EXAMPLE_QRCODE
 endif
 
-ifeq ($(BUILD_SUBGHZ), 1)
-CFLAGS		+= -DBUILD_SUBGHZ
-APP_INPUT = 1
-APP_GUI = 1
-APP_CLI = 1
+ifeq ($(APP_SUBGHZ), 1)
+CFLAGS		+= -DAPP_SUBGHZ
+SRV_INPUT = 1
+SRV_GUI = 1
+SRV_CLI = 1
 endif
 
+SRV_LF_RFID ?= 0
+ifeq ($(SRV_LF_RFID), 1)
+CFLAGS		+= -DSRV_LF_RFID
+APP_LF_RFID = 1
+endif
 APP_LF_RFID ?= 0
 ifeq ($(APP_LF_RFID), 1)
 CFLAGS		+= -DAPP_LF_RFID
-BUILD_LF_RFID = 1
-endif
-BUILD_LF_RFID ?= 0
-ifeq ($(BUILD_LF_RFID), 1)
-CFLAGS		+= -DBUILD_LF_RFID
-APP_INPUT = 1
-APP_GUI = 1
+SRV_INPUT = 1
+SRV_GUI = 1
 endif
 
+SRV_IRDA ?= 0
+ifeq ($(SRV_IRDA), 1)
+CFLAGS		+= -DSRV_IRDA
+APP_IRDA = 1
+endif
 APP_IRDA ?= 0
 ifeq ($(APP_IRDA), 1)
 CFLAGS		+= -DAPP_IRDA
-BUILD_IRDA = 1
-endif
-BUILD_IRDA ?= 0
-ifeq ($(BUILD_IRDA), 1)
-CFLAGS		+= -DBUILD_IRDA
-APP_INPUT = 1
-APP_GUI = 1
+SRV_INPUT = 1
+SRV_GUI = 1
 endif
 
+SRV_SD_TEST ?= 0
+ifeq ($(SRV_SD_TEST), 1)
+CFLAGS		+= -DSRV_SD_TEST
+APP_SD_TEST = 1
+endif
 APP_SD_TEST ?= 0
 ifeq ($(APP_SD_TEST), 1)
 CFLAGS		+= -DAPP_SD_TEST
-BUILD_SD_TEST = 1
-endif
-BUILD_SD_TEST ?= 0
-ifeq ($(BUILD_SD_TEST), 1)
-CFLAGS		+= -DBUILD_SD_TEST
-APP_INPUT = 1
-APP_GUI = 1
-APP_SD_FILESYSTEM = 1
+SRV_INPUT = 1
+SRV_GUI = 1
+SRV_SD_FILESYSTEM = 1
 endif
 
+SRV_SPEAKER_DEMO ?= 0
+ifeq ($(SRV_SPEAKER_DEMO), 1)
+CFLAGS		+= -DSRV_SPEAKER_DEMO
+APP_SPEAKER_DEMO = 1
+endif
 APP_SPEAKER_DEMO ?= 0
 ifeq ($(APP_SPEAKER_DEMO), 1)
 CFLAGS		+= -DAPP_SPEAKER_DEMO
-BUILD_SPEAKER_DEMO = 1
-endif
-BUILD_SPEAKER_DEMO ?= 0
-ifeq ($(BUILD_SPEAKER_DEMO), 1)
-CFLAGS		+= -DBUILD_SPEAKER_DEMO
-APP_INPUT = 1
-APP_GUI = 1
+SRV_INPUT = 1
+SRV_GUI = 1
 endif
 
-BUILD_VIBRO_DEMO ?= 0
-ifeq ($(BUILD_VIBRO_DEMO), 1)
-CFLAGS		+= -DBUILD_VIBRO_DEMO
-APP_INPUT = 1
+APP_VIBRO_DEMO ?= 0
+ifeq ($(APP_VIBRO_DEMO), 1)
+CFLAGS		+= -DAPP_VIBRO_DEMO
+SRV_INPUT = 1
 endif
 
+SRV_KEYPAD_TEST ?= 0
+ifeq ($(SRV_KEYPAD_TEST), 1)
+CFLAGS		+= -DSRV_KEYPAD_TEST
+APP_KEYPAD_TEST = 1
+endif
 APP_KEYPAD_TEST ?= 0
 ifeq ($(APP_KEYPAD_TEST), 1)
 CFLAGS		+= -DAPP_KEYPAD_TEST
-BUILD_KEYPAD_TEST = 1
-endif
-BUILD_KEYPAD_TEST ?= 0
-ifeq ($(BUILD_KEYPAD_TEST), 1)
-CFLAGS		+= -DBUILD_KEYPAD_TEST
-BUILD_KEYPAD_TEST = 1
+APP_KEYPAD_TEST = 1
 endif
 
+SRV_ACCESSOR ?= 0
+ifeq ($(SRV_ACCESSOR), 1)
+CFLAGS		+= -DSRV_ACCESSOR
+APP_ACCESSOR = 1
+endif
 APP_ACCESSOR ?= 0
 ifeq ($(APP_ACCESSOR), 1)
 CFLAGS		+= -DAPP_ACCESSOR
-BUILD_ACCESSOR = 1
-endif
-BUILD_ACCESSOR ?= 0
-ifeq ($(BUILD_ACCESSOR), 1)
-CFLAGS		+= -DBUILD_ACCESSOR
-BUILD_ACCESSOR = 1
+APP_ACCESSOR = 1
 endif
 
+SRV_GPIO_DEMO ?= 0
+ifeq ($(SRV_GPIO_DEMO), 1)
+CFLAGS		+= -DSRV_GPIO_DEMO
+APP_GPIO_DEMO = 1
+endif
 APP_GPIO_DEMO ?= 0
 ifeq ($(APP_GPIO_DEMO), 1)
 CFLAGS		+= -DAPP_GPIO_DEMO
-BUILD_GPIO_DEMO = 1
-endif
-BUILD_GPIO_DEMO ?= 0
-ifeq ($(BUILD_GPIO_DEMO), 1)
-CFLAGS		+= -DBUILD_GPIO_DEMO
 endif
 
+SRV_MUSIC_PLAYER ?= 0
+ifeq ($(SRV_MUSIC_PLAYER), 1)
+CFLAGS		+= -DSRV_MUSIC_PLAYER
+APP_MUSIC_PLAYER = 1
+endif
 APP_MUSIC_PLAYER ?= 0
 ifeq ($(APP_MUSIC_PLAYER), 1)
 CFLAGS		+= -DAPP_MUSIC_PLAYER
-BUILD_MUSIC_PLAYER = 1
-endif
-BUILD_MUSIC_PLAYER ?= 0
-ifeq ($(BUILD_MUSIC_PLAYER), 1)
-CFLAGS		+= -DBUILD_MUSIC_PLAYER
 endif
 
+SRV_FLOOPPER_BLOOPPER ?= 0
+ifeq ($(SRV_FLOOPPER_BLOOPPER), 1)
+CFLAGS		+= -DSRV_FLOOPPER_BLOOPPER
+APP_FLOOPPER_BLOOPPER = 1
+endif
 APP_FLOOPPER_BLOOPPER ?= 0
 ifeq ($(APP_FLOOPPER_BLOOPPER), 1)
 CFLAGS		+= -DAPP_FLOOPPER_BLOOPPER
-BUILD_FLOOPPER_BLOOPPER = 1
-endif
-BUILD_FLOOPPER_BLOOPPER ?= 0
-ifeq ($(BUILD_FLOOPPER_BLOOPPER), 1)
-CFLAGS		+= -DBUILD_FLOOPPER_BLOOPPER
 endif
 
+SRV_IBUTTON ?= 0
+ifeq ($(SRV_IBUTTON), 1)
+CFLAGS		+= -DSRV_IBUTTON
+APP_IBUTTON = 1
+endif
 APP_IBUTTON ?= 0
 ifeq ($(APP_IBUTTON), 1)
 CFLAGS		+= -DAPP_IBUTTON
-BUILD_IBUTTON = 1
-endif
-BUILD_IBUTTON ?= 0
-ifeq ($(BUILD_IBUTTON), 1)
-CFLAGS		+= -DBUILD_IBUTTON
 endif
 
+SRV_GUI_TEST ?= 0
+ifeq ($(SRV_GUI_TEST), 1)
+CFLAGS		+= -DSRV_GUI_TEST
+APP_GUI_TEST = 1
+endif
 APP_GUI_TEST ?= 0
 ifeq ($(APP_GUI_TEST), 1)
 CFLAGS		+= -DAPP_GUI_TEST
-BUILD_GUI_TEST = 1
-endif
-BUILD_GUI_TEST ?= 0
-ifeq ($(BUILD_GUI_TEST), 1)
-CFLAGS		+= -DBUILD_GUI_TEST
 endif
 
+SRV_SDNFC ?= 0
+ifeq ($(SRV_SDNFC), 1)
+CFLAGS		+= -DSRV_SDNFC
+APP_SDNFC = 1
+endif
 APP_SDNFC ?= 0
 ifeq ($(APP_SDNFC), 1)
 CFLAGS		+= -DAPP_SDNFC
-BUILD_SDNFC = 1
-endif
-BUILD_SDNFC ?= 0
-ifeq ($(BUILD_SDNFC), 1)
-CFLAGS		+= -DBUILD_SDNFC
 endif
 # device drivers
 
-APP_GUI	?= 0
-ifeq ($(APP_GUI), 1)
-CFLAGS		+= -DAPP_GUI
+SRV_GUI	?= 0
+ifeq ($(SRV_GUI), 1)
+CFLAGS		+= -DSRV_GUI
 endif
 
-APP_SD_FILESYSTEM	?= 0
-ifeq ($(APP_SD_FILESYSTEM), 1)
-CFLAGS		+= -DAPP_SD_FILESYSTEM
+SRV_SD_FILESYSTEM	?= 0
+ifeq ($(SRV_SD_FILESYSTEM), 1)
+CFLAGS		+= -DSRV_SD_FILESYSTEM
 endif
 
-APP_INPUT	?= 0
-ifeq ($(APP_INPUT), 1)
-CFLAGS		+= -DAPP_INPUT
+SRV_INPUT	?= 0
+ifeq ($(SRV_INPUT), 1)
+CFLAGS		+= -DSRV_INPUT
 endif
 
-APP_CLI ?= 0
-ifeq ($(APP_CLI), 1)
-APP_GUI		= 1
-CFLAGS		+= -DAPP_CLI
+SRV_CLI ?= 0
+ifeq ($(SRV_CLI), 1)
+SRV_GUI		= 1
+CFLAGS		+= -DSRV_CLI
 endif