From 994a211bd6903da0377d311408504f31826cdf93 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Fri, 22 Jun 2012 09:27:01 -0700
Subject: [PATCH] Bug 765294 - Fix packaging of services components; r=ted

---
 browser/build.mk                      |  2 --
 browser/confvars.sh                   |  2 ++
 browser/installer/package-manifest.in | 15 +++++++++++----
 config/autoconf.mk.in                 |  2 ++
 configure.in                          | 12 ++++++++++++
 services/Makefile.in                  | 12 +++++++++++-
 services/makefiles.sh                 |  2 ++
 7 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/browser/build.mk b/browser/build.mk
index 922a09e5b7e..1b572035bc7 100644
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -14,9 +14,7 @@ endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
-ifdef MOZ_SERVICES_SYNC
 tier_app_dirs += services
-endif
 
 ifdef MOZ_WEBAPP_RUNTIME
 tier_app_dirs += webapprt
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 18cb3227c6c..f117dd60ba6 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -17,6 +17,8 @@ fi
 
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_SAFE_BROWSING=1
+MOZ_SERVICES_AITC=1
+MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index e699b362095..83261fe78a2 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -447,15 +447,17 @@
 @BINPATH@/components/nsINIProcessor.js
 @BINPATH@/components/nsPrompter.manifest
 @BINPATH@/components/nsPrompter.js
-#ifdef MOZ_SERVICES_SYNC
-@BINPATH@/components/SyncComponents.manifest
+#ifdef MOZ_SERVICES_AITC
 @BINPATH@/components/AitcComponents.manifest
-@BINPATH@/components/Weave.js
 @BINPATH@/components/Aitc.js
 #endif
 #ifdef MOZ_SERVICES_NOTIFICATIONS
 @BINPATH@/components/NotificationsComponents.manifest
 #endif
+#ifdef MOZ_SERVICES_SYNC
+@BINPATH@/components/SyncComponents.manifest
+@BINPATH@/components/Weave.js
+#endif
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/messageWakeupService.js
@@ -535,9 +537,14 @@
 ; All the pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/firefox.js
 @BINPATH@/@PREF_DIR@/firefox-branding.js
+#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
-@BINPATH@/@PREF_DIR@/services-aitc.js
 #endif
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index d1888cf6980..ffb64f8109c 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -627,6 +627,8 @@ HAVE_COMPILER_FLAG_MSSSE3 = @HAVE_COMPILER_FLAG_MSSSE3@
 
 MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@
 
+MOZ_SERVICES_AITC = @MOZ_SERVICES_AITC@
+MOZ_SERVICES_NOTIFICATIONS = @MOZ_SERVICES_NOTIFICATIONS@
 MOZ_SERVICES_SYNC = @MOZ_SERVICES_SYNC@
 
 MOZ_WEBAPP_RUNTIME = @MOZ_WEBAPP_RUNTIME@
diff --git a/configure.in b/configure.in
index 604bf005bc8..d73e9fe3558 100644
--- a/configure.in
+++ b/configure.in
@@ -8214,6 +8214,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
diff --git a/services/Makefile.in b/services/Makefile.in
index 2e3fa3aa5d1..ccf7bdbe4d3 100644
--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -10,8 +10,18 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PARALLEL_DIRS += common crypto
+
+ifdef MOZ_SERVICES_AITC
+PARALLEL_DIRS += aitc
+endif
+
+ifdef MOZ_SERVICES_NOTIFICATIONS
+PARALLEL_DIRS += notifications
+endif
+
 ifdef MOZ_SERVICES_SYNC
-PARALLEL_DIRS += aitc common crypto notifications sync
+PARALLEL_DIRS += sync
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/makefiles.sh b/services/makefiles.sh
index 4aa7a29aa02..a055ea0e32e 100644
--- a/services/makefiles.sh
+++ b/services/makefiles.sh
@@ -5,6 +5,7 @@
 
 add_makefiles "
   services/Makefile
+  services/aitc/Makefile
   services/common/Makefile
   services/crypto/Makefile
   services/crypto/component/Makefile
@@ -15,6 +16,7 @@ add_makefiles "
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
+    services/aitc/tests/Makefile
     services/common/tests/Makefile
     services/crypto/tests/Makefile
     services/notifications/tests/Makefile