Bug 827513 - Remove services/notifications parts from SeaMonkey, rs=Callek, a=Ratty
authorFrank Wein <mcsmurf@mcsmurf.de>
Wed, 09 Jan 2013 00:12:16 +0100
changeset 14629 131f2f3e65b84366d921cd777351a2aa79dc7bda
parent 14628 157da067ff016fc0d67ef53039d62ff6cbf35816
child 14630 6eafbba68d75f0eda2b93da93660db91e170d524
push id845
push userbugzilla@standard8.plus.com
push dateTue, 19 Feb 2013 18:11:16 +0000
treeherdercomm-beta@ecc3ce2d7daa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, Ratty
bugs827513
Bug 827513 - Remove services/notifications parts from SeaMonkey, rs=Callek, a=Ratty
suite/confvars.sh
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -30,17 +30,16 @@ MOZ_STATIC_BUILD_UNSUPPORTED=1
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
 MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
 MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 MOZ_SERVICES_AITC=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
-MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 
 MOZ_UA_BUILDID=20100101
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -371,19 +371,16 @@
 @BINPATH@/components/GPSDGeolocationProvider.manifest
 @BINPATH@/components/Identity.manifest
 @BINPATH@/components/jsconsole-clhandler.js
 @BINPATH@/components/jsconsole-clhandler.manifest
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/NetworkGeolocationProvider.js
 @BINPATH@/components/NetworkGeolocationProvider.manifest
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@BINPATH@/components/NotificationsComponents.manifest
-#endif
 @BINPATH@/components/nsAbout.js
 @BINPATH@/components/nsBadCertHandler.js
 @BINPATH@/components/nsBadCertHandler.manifest
 @BINPATH@/components/nsBlocklistService.js
 @BINPATH@/components/nsBrowserContentHandler.js
 @BINPATH@/components/nsComposerCmdLineHandler.js
 @BINPATH@/components/nsComposerCmdLineHandler.manifest
 @BINPATH@/components/nsContentDispatchChooser.js
@@ -580,19 +577,16 @@
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/browser-prefs.js
 #ifdef LIBXUL_SDK
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 #endif
 #ifdef MOZ_SERVICES_AITC
 @BINPATH@/@PREF_DIR@/services-aitc.js
 #endif
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@BINPATH@/@PREF_DIR@/services-notifications.js
-#endif
 #ifdef MOZ_SERVICES_SYNC
 @BINPATH@/@PREF_DIR@/services-sync.js
 #endif
 @BINPATH@/@PREF_DIR@/composer.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 #ifndef LIBXUL_SDK
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -632,16 +632,17 @@ xpicleanup@BIN_SUFFIX@
   components/FeedWriter.js
   components/glautocomp.js
   components/GPSDGeolocationProvider.js
   components/jsconsole-clhandler.js
   components/jsmimeemitter.js
   components/mdn-service.js
   components/msgAsyncPrompter.js
   components/NetworkGeolocationProvider.js
+  components/NotificationsComponents.manifest
   components/newsblog.js
   components/nsAbAutoCompleteMyDomain.js
   components/nsAbAutoCompleteSearch.js
   components/nsAbLDAPAttributeMap.js
   components/nsAbout.js
   components/nsAboutCertError.js
   components/nsAboutData.js
   components/nsAboutFeeds.js
@@ -1036,16 +1037,17 @@ xpicleanup@BIN_SUFFIX@
   modules/services-common/observers.js
   modules/services-common/preferences.js
   modules/services-common/rest.js
   modules/services-common/stringbundle.js
   modules/services-common/tokenserverclient.js
   modules/services-common/utils.js
   modules/services-crypto/utils.js
   modules/services-crypto/WeaveCrypto.js
+  modules/services-notifications/service.js
   modules/services-sync/addonsreconciler.js
   modules/services-sync/constants.js
   modules/services-sync/engines/addons.js
   modules/services-sync/engines/apps.js
   modules/services-sync/engines/bookmarks.js
   modules/services-sync/engines/clients.js
   modules/services-sync/engines/forms.js
   modules/services-sync/engines/history.js
@@ -1134,19 +1136,17 @@ xpicleanup@BIN_SUFFIX@
   #endif
   components/binary.manifest
   #ifndef MOZ_SERVICES_SYNC
     components/Weave.js
   #endif
   #ifndef MOZ_SERVICES_AITC
     defaults/pref/services-aitc.js
   #endif
-  #ifndef MOZ_SERVICES_NOTIFICATIONS
-    defaults/pref/services-notifications.js
-  #endif
+  defaults/pref/services-notifications.js
   #ifndef MOZ_SERVICES_SYNC
     defaults/pref/services-sync.js
   #endif
   omni.ja
 #endif
 
 ; pre-libxul static mail library
 components/@DLL_PREFIX@mail@DLL_SUFFIX@