From 453bdf77efa73797b17d7b53e31b9e79185c4dda Mon Sep 17 00:00:00 2001 From: Anders Hoglund Date: Thu, 28 Jan 2016 16:21:32 +0100 Subject: [PATCH] Firmware version added to build artifacts. --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2bedb62ce8..d6e079fa73 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,12 @@ endif REVISION = $(shell git log -1 --format="%h") +FC_VER_MAJOR := $(shell grep " FC_VERSION_MAJOR" src/main/version.h | awk '{print $$3}' ) +FC_VER_MINOR := $(shell grep " FC_VERSION_MINOR" src/main/version.h | awk '{print $$3}' ) +FC_VER_PATCH := $(shell grep " FC_VERSION_PATCH" src/main/version.h | awk '{print $$3}' ) + +FC_VER := $(FC_VER_MAJOR).$(FC_VER_MINOR).$(FC_VER_PATCH) + # Working directories ROOT := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) SRC_DIR = $(ROOT)/src/main @@ -761,8 +767,8 @@ endif CC3D_OPBL_SRC = $(CC3D_SRC) -TARGET_BIN = $(BIN_DIR)/$(FORKNAME)_$(TARGET).bin -TARGET_HEX = $(BIN_DIR)/$(FORKNAME)_$(TARGET).hex +TARGET_BIN = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).bin +TARGET_HEX = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).hex TARGET_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).elf TARGET_OBJS = $(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $($(TARGET)_SRC)))) TARGET_DEPS = $(addsuffix .d,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $($(TARGET)_SRC))))