commit fd48f2eb05633e5a00fa1ca1bf8cd94d05a23b26
author krarvind <krarvind@gmail.com> Thu Nov 29 11:53:08 2012 -0400
committer krarvind <krarvind@gmail.com> Thu Nov 29 11:53:08 2012 -0400
tree cb5c674b2b02daee0225c14e0807de1270b693c0
parent 54afc30118968fffd9c4fd9af9f25569684b8258

jb4.2.1 base vendor/slim

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index b5e8cb4..bd183cf 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -157,11 +157,11 @@
 
 # T-Mobile theme engine
 include vendor/slim/config/themes_common.mk
-PRODUCT_VERSION_MAJOR = 3
-PRODUCT_VERSION_MINOR = 1
-PRODUCT_VERSION_MAINTENANCE = 0
+PRODUCT_VERSION_MAJOR = 4.2.1
+PRODUCT_VERSION_MINOR = Alpha
+PRODUCT_VERSION_MAINTENANCE = 1
 
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=JZO54K
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=JOP40D
 
 PRODUCT_PROPERTY_OVERRIDES += \
     updateme.filter=$(PRODUCT_RELEASE_NAME) \
@@ -170,25 +170,15 @@
 ifdef SLIM_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
         ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +%m%d%Y)
-else
-    ifdef SLIM_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-OFFICIAL
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(shell date +"%Y%m%d-%H%M")-UNOFFICIAL
-    endif
-endif
-
-ifdef SLIM_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
         ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-NIGHTLY-$(shell date +%m%d%Y)
 else
     ifdef SLIM_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
+            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-OFFICIAL
             ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-OFFICIAL
     else
         PRODUCT_PROPERTY_OVERRIDES += \
+            ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(shell date +"%Y%m%d-%H%M")-UNOFFICIAL
             ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-$(shell date +"%Y%m%d-%H%M")-UNOFFICIAL
     endif
 endif