From 99cff149b7dabba760395f45c3f55f05d71211f2 Mon Sep 17 00:00:00 2001 From: tkl Date: Mon, 1 Aug 2016 14:05:39 +0200 Subject: [PATCH] numbering... --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 415207d..1bff59b 100755 --- a/Makefile +++ b/Makefile @@ -1,13 +1,16 @@ -############################################################## -# -############################################################## - include config/make/rules.mk OS_NAME = kosmos -MAINFILE = $(EXE_DIR)/lib$(OS_NAME)-$(ARCH)-$(BOARD)$(DBG_EXT)$(LIB_EXT) -DEPLOY_PACKET = lib$(OS_NAME)-$(ARCH)-$(BOARD)-$()$(DBG_EXT).tar.gz +# version numbering deployed by ci deploy script - no necessary for local build +ifdef $(SW_KERNEL) +VERSION := -$(SW_KERNEL).$(SW_MAJOR).$(SW_MINOR)- +else +VERSION := +endif + +MAINFILE = $(EXE_DIR)/lib$(OS_NAME)-$(ARCH)-$(BOARD)$(VERSION)$(DBG_EXT)$(LIB_EXT) +DEPLOY_PACKET = lib$(OS_NAME)-$(ARCH)-$(BOARD)$(VERSION)$(DBG_EXT).tar.xz INCLUDES += $(SRC_DIR) @@ -30,17 +33,14 @@ ASMSOURCES += $(foreach folder, $(SUB_FOLDER), $(wildcard $(ROOT_DIR)/$(folder)/ all: check $(MAINFILE) deploy: all - echo $(SW_KERNEL) - echo $(SW_MAJOR) - echo $(SW_MINOR) @$(MKDIR) $(EXE_DIR)/include $(SRC_DIR)/scripts/board_interface.py -b "$(SRC_DIR)/firmware/arch/$(CPU)/board/$(BOARD)/include/$(BOARD).h" -o "$(EXE_DIR)/include/board_devices.h" $(SRC_DIR)/scripts/stack_interface.py -i "$(SRC_DIR)/firmware/arch/$(CPU)/include/$(CPU)_stack.h" -o "$(EXE_DIR)/include/stack.h" cp $(SRC_DIR)/firmware/kernel/interface/*.* $(EXE_DIR)/include/ + tar cvJf $(DEPLOY_PACKET) -C $(EXE_DIR) . + echo $(DEPLOY_PACKET) check: - echo $(CHECK_FOLDER) - echo $(CHECKSOURCES) $(CPPCHECK) $(CPPCHECK_FLAGS) $(CHECKSOURCES)