Bug 771235. (Cv1) Port bug 754062 and bug 765294 to SeaMonkey, Support MOZ_SERVICES_SYNC wrt SeaMonkey packaging (only). r=Callek.

Bug 754062 - Add services/notifications to services-central
Bug 765294 - Fix packaging of services modules

config/autoconf.mk.in

@@ -491,6 +491,10 @@ HAVE_DTRACE= @HAVE_DTRACE@
 
 VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
 
+MOZ_SERVICES_AITC = @MOZ_SERVICES_AITC@
+MOZ_SERVICES_NOTIFICATIONS = @MOZ_SERVICES_NOTIFICATIONS@
+MOZ_SERVICES_SYNC = @MOZ_SERVICES_SYNC@
+ 
 MOZ_OFFICIAL_BRANDING = @MOZ_OFFICIAL_BRANDING@
 
 JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@

configure.in

@@ -6613,6 +6613,18 @@ if test "$MOZ_PLACES"; then
   AC_DEFINE(MOZ_PLACES)
 fi
 
+dnl Build Apps in the Cloud (AITC) if required
+AC_SUBST(MOZ_SERVICES_AITC)
+if test -n "$MOZ_SERVICES_AITC"; then
+  AC_DEFINE(MOZ_SERVICES_AITC)
+fi
+
+dnl Build Notifications if required
+AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
+if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then
+  AC_DEFINE(MOZ_SERVICES_NOTIFICATIONS)
+fi
+
 dnl Build Sync Services if required
 AC_SUBST(MOZ_SERVICES_SYNC)
 if test -n "$MOZ_SERVICES_SYNC"; then

suite/confvars.sh

@@ -31,6 +31,8 @@ MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COM
 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_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 

suite/installer/package-manifest.in

@@ -336,8 +336,10 @@
 
 ; JavaScript components
 @BINPATH@/components/addonManager.js
+#ifdef MOZ_SERVICES_AITC
 @BINPATH@/components/Aitc.js
 @BINPATH@/components/AitcComponents.manifest
+#endif
 @BINPATH@/components/AlarmsManager.js
 @BINPATH@/components/AlarmsManager.manifest
 @BINPATH@/components/amContentHandler.js
@@ -367,6 +369,9 @@
 @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
@@ -443,12 +448,16 @@
 @BINPATH@/components/smileApplication.manifest
 @BINPATH@/components/storage-Legacy.js
 @BINPATH@/components/storage-mozStorage.js
+#ifdef MOZ_SERVICES_SYNC
 @BINPATH@/components/SyncComponents.manifest
+#endif
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
+#ifdef MOZ_SERVICES_SYNC
 @BINPATH@/components/Weave.js
+#endif
 @BINPATH@/components/Webapps.js
 @BINPATH@/components/Webapps.manifest
 @BINPATH@/components/WebContentConverter.js
@@ -557,8 +566,15 @@
 #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

suite/installer/removed-files.in

@@ -721,6 +721,8 @@ xpicleanup@BIN_SUFFIX@
   defaults/pref/composer.js
   defaults/pref/mailnews.js
   defaults/pref/mdn.js
+  defaults/pref/services-aitc.js
+  defaults/pref/services-notifications.js
   defaults/pref/services-sync.js
   defaults/pref/smime.js
   defaults/pref/suite-l10n.js
@@ -1119,7 +1121,22 @@ xpicleanup@BIN_SUFFIX@
     update.locale
   #endif
 #else
+  #ifndef MOZ_SERVICES_AITC
+    components/Aitc.js
+  #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
+  #ifndef MOZ_SERVICES_SYNC
+    defaults/pref/services-sync.js
+  #endif
   omni.ja
 #endif