Bug 619801 - Disable updater for Fennec release builds [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 11 Jan 2011 07:46:59 -0800
changeset 67242 521110f28816d6d2d57331bb7f704dc21e2d4126
parent 67241 4bd621cccc4a1a56abb9689fac10a04ce889c388
child 67243 6d9dba067177eb09d3f10734c8003897626dc6e0
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs619801
Bug 619801 - Disable updater for Fennec release builds [r=mfinkle]
mobile/branding/nightly/configure.sh
mobile/branding/official/configure.sh
mobile/chrome/content/about.xhtml
mobile/components/Makefile.in
mobile/components/MobileComponents.manifest
mobile/confvars.sh
mobile/installer/package-manifest.in
--- a/mobile/branding/nightly/configure.sh
+++ b/mobile/branding/nightly/configure.sh
@@ -1,1 +1,2 @@
 MOZ_APP_DISPLAYNAME=Fennec
+MOZ_UPDATER=1
--- a/mobile/branding/official/configure.sh
+++ b/mobile/branding/official/configure.sh
@@ -1,2 +1,3 @@
 MOZ_APP_DISPLAYNAME=Firefox
 ANDROID_PACKAGE_NAME=org.mozilla.firefox
+MOZ_UPDATER=
--- a/mobile/chrome/content/about.xhtml
+++ b/mobile/chrome/content/about.xhtml
@@ -62,20 +62,22 @@
 </head>
 
 <body dir="&locale.dir;">
   <div id="wrapper">
     <div id="aboutLogoContainer">
       <img src="about:logo" alt="&brandShortName;"/>
 #expand <p id="version">&about.version; __MOZ_APP_VERSION__</p>
     </div>
+#ifdef MOZ_UPDATER
     <button id="update" onclick="checkForUpdates();">&aboutPage.checkForUpdates.button;</button>
     <span id="update-message-checking">&aboutPage.checkForUpdates.checking;</span>
     <span id="update-message-none">&aboutPage.checkForUpdates.none;</span>
     <span id="update-message-found">&aboutPage.checkForUpdates.found;</span>
+#endif
 
     <ul id="aboutLinks">
       <li><a id="faqURL">&aboutPage.faq.label;</a></li>
       <li><a id="supportURL">&aboutPage.support.label;</a></li>
       <li><a id="privacyURL">&aboutPage.privacyPolicy.label;</a></li>
       <li><a href="about:rights">&aboutPage.rights.label;</a></li>
       <li><a id="releaseNotesURL">&aboutPage.relNotes.label;</a></li>
       <li><a id="creditsURL">&aboutPage.credits.label;</a></li>
@@ -112,16 +114,17 @@
       if (ua) {
         let uaP = document.getElementById("aboutUA");
         uaP.appendChild(document.createTextNode(ua));
       }
 
       Cu.import("resource://gre/modules/XPCOMUtils.jsm");
       Cu.import("resource://gre/modules/Services.jsm");
 
+#ifdef MOZ_UPDATER
       let Updater = {
         isChecking: false,
         update: null,
 
         get updateEnabled() {
           try {
             return Services.prefs.getBoolPref("app.update.enabled");
           }
@@ -222,12 +225,13 @@
 
         setTimeout(function() {
           noneSpan.style.display = "none";
           foundSpan.style.display = "none";
           checkingSpan.style.display = "none";
           updateButton.style.display = "block";
         }, 2000);
       }
+#endif
     ]]></script>
   </div>
 </body>
 </html>
--- a/mobile/components/Makefile.in
+++ b/mobile/components/Makefile.in
@@ -69,18 +69,21 @@ EXTRA_COMPONENTS = \
         PromptService.js \
         ContentDispatchChooser.js \
         AutoCompleteCache.js \
         AddonUpdateService.js \
         FormAutoComplete.js \
         LoginManager.js \
         LoginManagerPrompter.js \
         BlocklistPrompt.js \
-        UpdatePrompt.js \
-	$(NULL)
+        $(NULL)
+
+ifdef MOZ_UPDATER
+EXTRA_COMPONENTS += UpdatePrompt.js
+endif
 
 ifndef ANDROID
 EXTRA_COMPONENTS += AlertsService.js
 endif
 
 ifneq (Android,$(OS_TARGET))
 DIRS =  phone \
         $(NULL)
--- a/mobile/components/MobileComponents.manifest
+++ b/mobile/components/MobileComponents.manifest
@@ -97,11 +97,13 @@ contract @mozilla.org/login-manager;1 {f
 # LoginManagerPrompter.js
 component {97d12931-abe2-11df-94e2-0800200c9a66} LoginManagerPrompter.js
 contract @mozilla.org/login-manager/prompter;1 {97d12931-abe2-11df-94e2-0800200c9a66}
 
 # BlocklistPrompt.js
 component {4e6ea350-b09a-11df-94e2-0800200c9a66} BlocklistPrompt.js
 contract @mozilla.org/addons/blocklist-prompt;1 {4e6ea350-b09a-11df-94e2-0800200c9a66}
 
+#ifdef MOZ_UPDATER
 # UpdatePrompt.js
 component {88b3eb21-d072-4e3b-886d-f89d8c49fe59} UpdatePrompt.js
 contract @mozilla.org/updates/update-prompt;1 {88b3eb21-d072-4e3b-886d-f89d8c49fe59}
+#endif
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -40,17 +40,16 @@ MOZ_APP_UA_NAME=Fennec
 
 MOZ_APP_VERSION=4.0b4pre
 
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SERVICES_SYNC=1
-MOZ_UPDATER=1
 
 MOZ_ENABLE_LIBXUL=1
 MOZ_DISABLE_DOMCRYPTO=1
 
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
 MOZ_XULRUNNER=
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -22,18 +22,20 @@
 @BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
 @BINPATH@/@PREF_DIR@/mobile-l10n.js
 @BINPATH@/searchplugins/*
 @BINPATH@/defaults/profile/bookmarks.html
 @BINPATH@/defaults/profile/localstore.rdf
 @BINPATH@/defaults/profile/mimeTypes.rdf
 @BINPATH@/defaults/profile/chrome/*
+#ifdef MOZ_UPDATER
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
+#endif
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
 #ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
 #endif
 
 [xpcom]
@@ -250,17 +252,19 @@
 #endif
 @BINPATH@/components/txtsvc.xpt
 @BINPATH@/components/txmgr.xpt
 #ifdef MOZ_USE_NATIVE_UCONV
 @BINPATH@/components/ucnative.xpt
 #endif
 @BINPATH@/components/uconv.xpt
 @BINPATH@/components/unicharutil.xpt
+#ifdef MOZ_UPDATER
 @BINPATH@/components/update.xpt
+#endif
 @BINPATH@/components/uriloader.xpt
 @BINPATH@/components/urlformatter.xpt
 @BINPATH@/components/webBrowser_core.xpt
 @BINPATH@/components/webbrowserpersist.xpt
 @BINPATH@/components/webshell_idls.xpt
 @BINPATH@/components/widget.xpt
 #ifdef XP_MACOSX
 @BINPATH@/components/widget_cocoa.xpt
@@ -546,21 +550,23 @@ bin/libfreebl_32fpu_3.so
 bin/libfreebl_32int_3.chk
 bin/libfreebl_32int_3.so
 bin/libfreebl_32int64_3.chk
 bin/libfreebl_32int64_3.so
 #endif
 
 ; [Updater]
 ;
+#ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
 @BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
+#endif
 
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
@@ -624,15 +630,17 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 @BINPATH@/components/HelperAppDialog.js
 @BINPATH@/components/LoginManager.js
 @BINPATH@/components/LoginManagerPrompter.js
 @BINPATH@/components/MobileComponents.manifest
 @BINPATH@/components/MobileComponents.xpt
 @BINPATH@/components/PromptService.js
 @BINPATH@/components/SessionStore.js
 @BINPATH@/components/Sidebar.js
+#ifdef MOZ_UPDATER
 @BINPATH@/components/UpdatePrompt.js
+#endif
 @BINPATH@/components/XPIDialogService.js
 #ifndef ANDROID
 @BINPATH@/components/@DLL_PREFIX@mozphone@DLL_SUFFIX@
 @BINPATH@/components/mozphone.xpt
 #endif
 @BINPATH@/extensions/feedback@mobile.mozilla.org.xpi