Bug 800154 - Refactor how services/ integrates with build system; r=glandium; a=akeybl
authorGregory Szorc <gps@mozilla.com>
Thu, 11 Oct 2012 10:34:09 -0700
changeset 116056 219821425bc1554568fd5728346ab8aa7f85dfce
parent 116055 ea4ac99c08e6b72428e99d9046f0dc995a52e297
child 116057 916e162d0240b805004d6a6a7203e5c676d9543a
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, akeybl
bugs800154
milestone18.0a2
Bug 800154 - Refactor how services/ integrates with build system; r=glandium; a=akeybl We now have MOZ_SERVICES_COMMON and MOZ_SERVICES_CRYPTO to control inclusion of services/common and services/crypto, respectively.
b2g/build.mk
b2g/confvars.sh
browser/confvars.sh
configure.in
mobile/xul/confvars.sh
services/Makefile.in
services/makefiles.sh
--- a/b2g/build.mk
+++ b/b2g/build.mk
@@ -13,19 +13,17 @@ endif
 endif
 
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
-ifdef MOZ_SERVICES_SYNC
 tier_app_dirs += services
-endif
 
 tier_app_dirs += \
   $(MOZ_BRANDING_DIRECTORY) \
   b2g \
   $(NULL)
 
 
 installer: 
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -12,17 +12,17 @@ MOZ_UA_OS_AGNOSTIC=1
 
 MOZ_B2G_VERSION=1.0.0
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SAFE_BROWSING=
-MOZ_SERVICES_SYNC=
+MOZ_SERVICES_COMMON=1
 
 MOZ_WEBSMS_BACKEND=1
 MOZ_DISABLE_DOMCRYPTO=1
 MOZ_APP_STATIC_INI=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -14,16 +14,18 @@ if test "$OS_ARCH" = "WINNT"; then
     MOZ_MAINTENANCE_SERVICE=1
   fi
 fi
 
 MOZ_STUB_INSTALLER=1
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_AITC=1
+MOZ_SERVICES_COMMON=1
+MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
 # because branding dependencies are broken.
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
--- a/configure.in
+++ b/configure.in
@@ -8242,16 +8242,28 @@ if test "$MOZ_PLACES"; then
 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 Common JS modules provided by services.
+AC_SUBST(MOZ_SERVICES_COMMON)
+if test -n "$MOZ_SERVICES_COMMON"; then
+  AC_DEFINE(MOZ_SERVICES_COMMON)
+fi
+
+dnl Build Services crypto component (used by Sync)
+AC_SUBST(MOZ_SERVICES_CRYPTO)
+if test -n "$MOZ_SERVICES_CRYPTO"; then
+  AC_DEFINE(MOZ_SERVICES_CRYPTO)
+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)
--- a/mobile/xul/confvars.sh
+++ b/mobile/xul/confvars.sh
@@ -7,16 +7,19 @@ MOZ_APP_VENDOR=Mozilla
 
 MOZ_APP_VERSION=18.0a2
 
 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SAFE_BROWSING=
+
+MOZ_SERVICES_COMMON=1
+MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 
 MOZ_DISABLE_DOMCRYPTO=1
 
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
 MOZ_XULRUNNER=
--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -5,17 +5,23 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PARALLEL_DIRS += common crypto
+ifdef MOZ_SERVICES_COMMON
+PARALLEL_DIRS += common
+endif
+
+ifdef MOZ_SERVICES_CRYPTO
+PARALLEL_DIRS += crypto
+endif
 
 ifdef MOZ_SERVICES_AITC
 PARALLEL_DIRS += aitc
 endif
 
 ifdef MOZ_SERVICES_NOTIFICATIONS
 PARALLEL_DIRS += notifications
 endif
--- a/services/makefiles.sh
+++ b/services/makefiles.sh
@@ -1,9 +1,8 @@
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 add_makefiles "
   services/Makefile
   services/aitc/Makefile
   services/common/Makefile