Bug 538174 followup, don't have version depend on branding, r=mfinkle
authorGavin Sharp <gavin@gavinsharp.com>
Wed, 06 Jan 2010 22:38:40 -0500
changeset 65952 5edcb77ed8c0df25c5553450d42fada6e3f07ee5
parent 65951 a5c155941126fa91b6ba47a1758eb723ebe8e6d0
child 65953 c0f6370618b59fe07f2e9409fab205bc33e03e90
push idunknown
push userunknown
push dateunknown
reviewersmfinkle
bugs538174
Bug 538174 followup, don't have version depend on branding, r=mfinkle
mobile/branding/nightly/configure.sh
mobile/branding/official/configure.sh
mobile/confvars.sh
--- a/mobile/branding/nightly/configure.sh
+++ b/mobile/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.1a1pre
-    ;;
-esac
--- a/mobile/branding/official/configure.sh
+++ b/mobile/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.1a1
-    ;;
-esac
--- a/mobile/confvars.sh
+++ b/mobile/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.1a1pre
+    ;;
+esac
 
 MOZ_XUL_APP=1
 MOZ_UPDATER=0
 MOZ_ENABLE_LIBXUL=1
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_XULRUNNER=1