From b3659f75b8b135bcdbc2565f9ade4ca0cdf831ee Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 29 Jun 2019 19:06:41 +0000 Subject: [PATCH] defs.mk: Default to 1.0.0-0-dev, if $(TOPDIR)/VERSION is absent Signed-off-by: Jan Lindemann --- make/defs.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 176df691..0419348c 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -121,12 +121,6 @@ beautify_lib_path = $(SED) 's/:/\n + /g' find_files = $(wildcard $(addsuffix /$(1),$(patsubst :, ,$(2)))) find_file = $(firstword $(call find_files,$(1),$(2)) $(1)-not-found) -ifeq ($(INCLUDE_REV_IN_VERSIONS),true) - version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g') -else - version = $(shell $(CAT) $1/VERSION | $(SED) 's/-.*//; s/[ ]*//g') -endif - define install_links cwd="$(CWD)"; \ $(ECHO) "o in $(INSTALL_$(1)DIR):" ;\ @@ -231,8 +225,12 @@ CREATE_DEVEL ?= true ifeq ($(VERSION),) ifneq ($(wildcard $(VERSION_FILE)),) VERSION := $(shell $(CAT) $(VERSION_FILE)) + else + VERSION := $(shell echo 1.0.0.0-dev | tee $(VERSION_FILE)) + $(warning Automatically created missing $(VERSION_FILE).) endif endif + DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION)) HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \ $(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | $(XARGS) $(PRINTF) "0x%02x%02x%02x%02x")