Bug 311965 (Thunderbird patch) - Refactor nsUpdateService.js to load less code at startup. r=philor
authorRobert Strong <robert.bugzilla@gmail.com>
Tue, 03 Nov 2009 11:55:00 -0800
changeset 4300 21d65f4a44395572c01b74f7cbc68de4b05d335e
parent 4299 51460ab23791a8143a7576b6536e7659fb321387
child 4301 b1383e748fc7a08da97a441cbd6a9bd2dc49cec7
push idunknown
push userunknown
push dateunknown
reviewersphilor
bugs311965
Bug 311965 (Thunderbird patch) - Refactor nsUpdateService.js to load less code at startup. r=philor
mail/installer/Makefile.in
mail/installer/removed-files.in
mail/installer/windows/Makefile.in
mail/installer/windows/packages-static
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -69,16 +69,20 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 	newsblog \
 	offline \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
 DEFINES += -DAB_CD=$(AB_CD)
 
+ifdef MOZ_UPDATER
+DEFINES += -DMOZ_UPDATER=1
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -63,16 +63,22 @@ components/nsLDAPPrefsService.js
 components/nsPostUpdateWin.js
 #endif
 #endif
 components/nsScriptableIO.js
 #ifdef XP_MACOSX
 components/nsSpotlightIntegration.js
 #endif
 components/nsUnsetDefaultMail.js
+#ifndef MOZILLA_1_9_2_BRANCH
+#ifndef MOZ_UPDATER
+components/nsUpdateService.js
+components/nsUpdateServiceStub.js
+#endif
+#endif
 components/nsUrlClassifierTable.js
 #ifdef XP_WIN
 components/nsWinSearchIntegration.js
 #endif
 components/progressDlg.xpt
 components/sidebar.xpt
 components/signonviewer.xpt
 components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -48,16 +48,20 @@ include $(MOZILLA_SRCDIR)/toolkit/mozapp
 CONFIG_DIR = instgen
 SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/thunderbird/7zSD.sfx
 
 APP_VERSION := $(shell cat $(MOZ_APP_VERSION_TXT))
 DEFINES += -DAPP_VERSION=$(APP_VERSION)
 PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py $(APP_VERSION))
 DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
 
+ifdef MOZ_UPDATER
+DEFINES += -DMOZ_UPDATER=1
+endif
+
 PP_LOCALIZED_FILES = \
 	packages-static \
 	$(NULL)
 
 # All script and locale files used by the Unicode version of NSIS need to be
 # converted from UTF-8 to UTF-16LE
 INSTALLER_FILES_CONV = \
 	nsis/installer.nsi \
--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -379,19 +379,24 @@ bin\components\necko_socket.xpt
 bin\components\necko_viewsource.xpt
 bin\components\necko_wifi.xpt
 bin\components\nsProxyAutoConfig.js
 
 ; extensions
 bin\components\nsAddonRepository.js
 bin\components\nsExtensionManager.js
 bin\components\nsBlocklistService.js
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\components\nsUpdateService.js
-#ifdef MOZILLA_1_9_1_BRANCH
-bin\components\nsPostUpdateWin.js
+#else
+#ifdef MOZ_UPDATER
+bin\components\nsUpdateService.js
+bin\components\nsUpdateServiceStub.js
+#endif
+bin\components\nsUpdateTimerManager.js
 #endif
 bin\components\extensions.xpt
 bin\components\update.xpt
 #ifdef MOZ_WEBSERVICES
 bin\components\websrvcs.xpt
 #endif
 bin\components\nsURLFormatter.js
 bin\components\urlformatter.xpt