diff options
| author | Warren Togami <wtogami@gmail.com> | 2012-05-06 19:49:33 -1000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-06-09 01:32:32 +0100 |
| commit | 689102715ef0a930cd60e6aaced01316f77d0703 (patch) | |
| tree | bdf13d04199f65ae2c925d638ffec8b405ba16e3 | |
| parent | cefe4f7beb44f6111e6090e0602c1b3254e389a8 (diff) | |
| download | vendor_replicant-689102715ef0a930cd60e6aaced01316f77d0703.zip vendor_replicant-689102715ef0a930cd60e6aaced01316f77d0703.tar.gz vendor_replicant-689102715ef0a930cd60e6aaced01316f77d0703.tar.bz2 | |
Simplify ROM filename, s/SNAPSHOT/EXPERIMENTAL/, other cleanups
* Remove "update-" prefix and "-signed" suffix.
* Replace SNAPSHOT with EXPERIMENTAL (arcee).
* If CM_EXTRAVERSION, force to type EXPERIMENTAL.
* UNOFFICIAL builds now with datestamp in the same manner as NIGHTLY.
* date -u uses UTC timezone for consistency.
* Remove some CM7 dead code.
Change-Id: I681fd92e27aaf62c50eae20265ce07c67d477bca
Conflicts:
products/common_versions.mk
| -rw-r--r-- | products/common_versions.mk | 36 | ||||
| -rwxr-xr-x | tools/squisher | 2 |
2 files changed, 29 insertions, 9 deletions
diff --git a/products/common_versions.mk b/products/common_versions.mk index 45eadf7..3720929 100644 --- a/products/common_versions.mk +++ b/products/common_versions.mk @@ -1,18 +1,38 @@ PRODUCT_VERSION_MAJOR = 7 PRODUCT_VERSION_MINOR = 2 -PRODUCT_VERSION_MAINTENANCE = 0-RC3 +PRODUCT_VERSION_MAINTENANCE = 0 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=GWK74 +# Set BUILDTYPE + ifdef CYANOGEN_NIGHTLY - CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD) + CM_BUILDTYPE := NIGHTLY +endif +ifdef CYANOGEN_EXPERIMENTAL + CM_BUILDTYPE := EXPERIMENTAL +endif +ifdef CYANOGEN_RELEASE + CM_BUILDTYPE := RELEASE +endif + +ifdef CYANOGEN_EXTRAVERSION + # Force build type to EXPERIMENTAL + CM_BUILDTYPE := EXPERIMENTAL + # Add leading dash to CM_EXTRAVERSION + CM_EXTRAVERSION := -$(CYANOGEN_EXTRAVERSION) +endif + +# If CM_BUILDTYPE is not defined, set to UNOFFICIAL +ifndef CYANOGEN_BUILDTYPE + CM_BUILDTYPE := UNOFFICIAL +endif + +ifdef CYANOGEN_RELEASE + CMVERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) else - ifdef CYANOGEN_RELEASE - CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD) - else - CMVERSION := CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)-KANG - endif + CMVERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION) endif PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=$(CMVERSION) + ro.modversion=CyanogenMod-$(CMVERSION) diff --git a/tools/squisher b/tools/squisher index 8323c0d..1c56748 100755 --- a/tools/squisher +++ b/tools/squisher @@ -140,7 +140,7 @@ rm -rf $REPACK/ota/recovery # Determine what to name the new signed package MODVERSION=`sed -n -e'/ro\.modversion/s/^.*CyanogenMod-//p' $REPACK/ota/system/build.prop` : ${MODVERSION:=nightly} - OUTFILE=$OUT/update-cm-$MODVERSION-signed.zip + OUTFILE=$OUT/cm-$MODVERSION.zip # Pack it up and sign printf "Zipping package..." |