Skip to content

Commit

Permalink
floko: Start our versioning
Browse files Browse the repository at this point in the history
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
  • Loading branch information
lindwurm committed Jan 11, 2019
1 parent ec86768 commit 4c2e315
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 28 deletions.
25 changes: 7 additions & 18 deletions config/aicp_version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_VERSION_TAGS=release-keys BUILD_UTC_DATE=$

AICP_BRANCH=p

# AICP RELEASE VERSION
AICP_VERSION_MAJOR = 14
# RELEASE VERSION
AICP_VERSION_MAJOR = 9
AICP_VERSION_MINOR = 0
AICP_VERSION_MAINTENANCE = 0

Expand All @@ -21,20 +21,20 @@ endif

ifdef AICP_BUILDTYPE
ifeq ($(AICP_BUILDTYPE), NIGHTLY)
AICP_VERSION := $(TARGET_PRODUCT)_$(AICP_BRANCH)-$(VERSION)-NIGHTLY-$(shell date -u +%Y%m%d)
AICP_VERSION := floko_$(AICP_BUILD)_$(AICP_BRANCH)-$(VERSION)-NIGHTLY-$(shell date -u +%Y%m%d)
endif
ifeq ($(AICP_BUILDTYPE), WEEKLY)
AICP_VERSION := $(TARGET_PRODUCT)_$(AICP_BRANCH)-$(VERSION)-WEEKLY-$(shell date -u +%Y%m%d)
AICP_VERSION := floko_$(AICP_BUILD)_$(AICP_BRANCH)-$(VERSION)-WEEKLY-$(shell date -u +%Y%m%d)
endif
ifeq ($(AICP_BUILDTYPE), EXPERIMENTAL)
AICP_VERSION := $(TARGET_PRODUCT)_$(AICP_BRANCH)-$(VERSION)-EXPERIMENTAL-$(shell date -u +%Y%m%d)
AICP_VERSION := floko_$(AICP_BUILD)_$(AICP_BRANCH)-$(VERSION)-EXPERIMENTAL-$(shell date -u +%Y%m%d)
endif
ifeq ($(AICP_BUILDTYPE), UNOFFICIAL)
AICP_VERSION := $(TARGET_PRODUCT)_$(AICP_BRANCH)-$(VERSION)-UNOFFICIAL-$(shell date -u +%Y%m%d)
AICP_VERSION := floko_$(AICP_BUILD)_$(AICP_BRANCH)-$(VERSION)-UNOFFICIAL-$(shell date -u +%Y%m%d)
endif
else
#We reset back to UNOFFICIAL
AICP_VERSION := $(TARGET_PRODUCT)_$(AICP_BRANCH)-$(VERSION)-UNOFFICIAL-$(shell date -u +%Y%m%d)
AICP_VERSION := floko_$(AICP_BUILD)_$(AICP_BRANCH)-$(VERSION)-UNOFFICIAL-$(shell date -u +%Y%m%d)
endif

# AICP System Version
Expand All @@ -45,14 +45,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.aicp.version.update=$(AICP_BRANCH)-$(VERSION) \
ro.aicp.build.version=$(VERSION) \
ro.aicp.display.version=$(AICP_VERSION)

# needed for statistics
PRODUCT_PROPERTY_OVERRIDES += \
ro.aicp.branch=$(AICP_BRANCH) \
ro.romstats.url=https://stats.aicp-rom.com/ \
ro.romstats.name=AICP \
ro.romstats.buildtype=$(AICP_BUILDTYPE) \
ro.romstats.version=$(VERSION) \
ro.romstats.tframe=1 \
ro.romstats.askfirst=1 \
ro.romstats.ga=UA-48128535-2
12 changes: 3 additions & 9 deletions config/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ PRODUCT_PACKAGES += \

# Versioning System
# AICP first version.
PRODUCT_VERSION_MAJOR = 14
PRODUCT_VERSION_MAJOR = 9
PRODUCT_VERSION_MINOR = 0
PRODUCT_VERSION_MAINTENANCE = 0
AICP_POSTFIX := -$(shell date +"%Y%m%d-%H%M")
Expand All @@ -200,8 +200,8 @@ ifndef AICP_BUILDTYPE
endif

# Set all versions
AICP_VERSION :=AICP-$(AICP_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AICP_BUILDTYPE)$(AICP_POSTFIX)
AICP_MOD_VERSION := AICP-$(AICP_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AICP_BUILDTYPE)$(AICP_POSTFIX)
AICP_VERSION :=Floko-$(AICP_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AICP_BUILDTYPE)$(AICP_POSTFIX)
AICP_MOD_VERSION := Floko-$(AICP_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AICP_BUILDTYPE)$(AICP_POSTFIX)

PRODUCT_PROPERTY_OVERRIDES += \
BUILD_DISPLAY_ID=$(BUILD_ID) \
Expand All @@ -212,12 +212,6 @@ PRODUCT_PROPERTY_OVERRIDES += \

include vendor/aicp/config/aicp_version.mk

# AICP OTA
ifneq ($(AICP_BUILDTYPE),UNOFFICIAL)
PRODUCT_PACKAGES += \
AICP_OTA_Updater
endif

# Google sounds
include vendor/aicp/google/GoogleAudio.mk

Expand Down
2 changes: 1 addition & 1 deletion prebuilt/common/etc/init.d/00banner
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
L="log -p i -t aicp"

$L "Welcome to Android `getprop ro.build.version.release` / AICP `getprop ro.aicp.version`";
$L "Welcome to Android `getprop ro.build.version.release` / Floko `getprop ro.aicp.version`";

0 comments on commit 4c2e315

Please sign in to comment.