StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: Make use of LINEAGE_VERSION_APPEND_TIME_OF_DAY consistent

Browse Source 
Change-Id: I9cd0aaa205663e44614e07318ca66c3e0aba7c8e
This commit is contained in:
Michael Bestas
2022-03-13 21:17:02 +02:00
parent 1667b61789
commit 9b81c29acc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/version.mk
View File

@@ -1,6 +1,12 @@
PRODUCT_VERSION_MAJOR = 19 PRODUCT_VERSION_MAJOR = 19
PRODUCT_VERSION_MINOR = 1 PRODUCT_VERSION_MINOR = 1
ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d_%H%M%S)
else
LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d)
endif
# Set LINEAGE_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat # Set LINEAGE_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
ifndef LINEAGE_BUILDTYPE ifndef LINEAGE_BUILDTYPE
@@ -52,11 +58,7 @@ endif
ifeq ($(LINEAGE_BUILDTYPE), RELEASE) ifeq ($(LINEAGE_BUILDTYPE), RELEASE)
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
else else
ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true) LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_BUILD_DATE)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d_%H%M%S)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
else
LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
endif
endif endif
# Display version # Display version
@@ -70,7 +72,7 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//') LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION) TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION)
else else
TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d) TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_BUILD_DATE)
endif endif
LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD) LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
endif endif