Bug 538174 followup, don't have version depend on branding, r=mfinkle GECKO192_20100105_RELBRANCH FENNEC_1_0rc2_BUILD2
authorGavin Sharp <gavin@gavinsharp.com>
Wed, 06 Jan 2010 22:38:40 -0500
branchGECKO192_20100105_RELBRANCH
changeset 1276 f789f40c380fbc83adb05166173b0116a298ba54
parent 1275 50eb774097a581e021b8a247543f28e9ae779fe5
child 1278 f15f75fece49c5c26dcd6c65633202938de316ba
push id1134
push usergsharp@mozilla.com
push dateThu, 07 Jan 2010 03:38:56 +0000
reviewersmfinkle
bugs538174
Bug 538174 followup, don't have version depend on branding, r=mfinkle
branding/nightly/configure.sh
branding/official/configure.sh
confvars.sh
--- a/branding/nightly/configure.sh
+++ b/branding/nightly/configure.sh
@@ -1,11 +1,2 @@
 MOZ_APP_DISPLAYNAME=Fennec
 MOZ_APP_UA_EXTRA=Namoroka
-
-case "$target" in
-*-wince*)
-    MOZ_APP_VERSION=1.0a4pre
-    ;;
-*)
-    MOZ_APP_VERSION=1.0
-    ;;
-esac
--- a/branding/official/configure.sh
+++ b/branding/official/configure.sh
@@ -1,11 +1,2 @@
 MOZ_APP_DISPLAYNAME=Firefox
 MOZ_APP_UA_EXTRA=Firefox
-
-case "$target" in
-*-wince*)
-    MOZ_APP_VERSION=1.0a4pre
-    ;;
-*)
-    MOZ_APP_VERSION=1.0.0
-    ;;
-esac
--- a/confvars.sh
+++ b/confvars.sh
@@ -35,15 +35,23 @@
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=fennec
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
 
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
-# MOZ_APP_VERSION is set by branding/configure.sh
+
+case "$target" in
+*-wince*)
+    MOZ_APP_VERSION=1.0a4pre
+    ;;
+*)
+    MOZ_APP_VERSION=1.0.0
+    ;;
+esac
 
 MOZ_XUL_APP=1
 MOZ_UPDATER=0
 MOZ_ENABLE_LIBXUL=1
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_XULRUNNER=1