wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 619801 - Disable updater for Fennec release builds [r=mfinkle]

Browse Source
This commit is contained in:
Matt Brubeck 2011-01-11 07:46:59 -08:00
parent ecfd55db18
commit 9eb07d7463
7 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/branding/nightly/configure.sh
View File

@ -1 +1,2 @@
MOZ_APP_DISPLAYNAME=Fennec
MOZ_UPDATER=1

1
mobile/branding/official/configure.sh
View File

@ -1,2 +1,3 @@
MOZ_APP_DISPLAYNAME=Firefox
ANDROID_PACKAGE_NAME=org.mozilla.firefox
MOZ_UPDATER=

4
mobile/chrome/content/about.xhtml
View File

@ -67,10 +67,12 @@
<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>
@ -117,6 +119,7 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
#ifdef MOZ_UPDATER
let Updater = {
isChecking: false,
update: null,
@ -227,6 +230,7 @@
updateButton.style.display = "block";
}, 2000);
}
#endif
]]></script>
</div>
</body>

7
mobile/components/Makefile.in
View File

@ -74,8 +74,11 @@ EXTRA_COMPONENTS = \
LoginManager.js \
LoginManagerPrompter.js \
BlocklistPrompt.js \
UpdatePrompt.js \
$(NULL)
$(NULL)
ifdef MOZ_UPDATER
EXTRA_COMPONENTS += UpdatePrompt.js
endif
ifndef ANDROID
EXTRA_COMPONENTS += AlertsService.js

2
mobile/components/MobileComponents.manifest
View File

@ -102,6 +102,8 @@ contract @mozilla.org/login-manager/prompter;1 {97d12931-abe2-11df-94e2-0800200c
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

1
mobile/confvars.sh
View File

@ -45,7 +45,6 @@ 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

8
mobile/installer/package-manifest.in
View File

@ -27,8 +27,10 @@
@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
@ -255,7 +257,9 @@
#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
@ -551,11 +555,13 @@ bin/libfreebl_32int64_3.so
; [Updater]
;
#ifdef MOZ_UPDATER
#ifdef XP_MACOSX
@BINPATH@/updater.app/
#else
@BINPATH@/updater@BIN_SUFFIX@
#endif
#endif
; [Crash Reporter]
;
@ -629,7 +635,9 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@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@