Bug 576970 - Port Sync UI to SeaMonkey. Part 1: Build. r=Callek
authorJens Hatlak <jh@junetz.de>
Thu, 27 Jan 2011 23:32:31 +0100
changeset 7022 c11d58cfe431ca22ae8c198b249971372add76bc
parent 7021 de1b3c4b08a698b733786b0671f296ba80b3e513
child 7023 ddb25b1eeab156e3e6b28c02fa41c08806ef2708
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs576970
Bug 576970 - Port Sync UI to SeaMonkey. Part 1: Build. r=Callek
configure.in
suite/build.mk
suite/confvars.sh
suite/installer/package-manifest.in
--- a/configure.in
+++ b/configure.in
@@ -6752,16 +6752,22 @@ if test "$MOZ_MORKREADER"; then
   AC_DEFINE(MOZ_MORKREADER)
 fi
 
 AC_SUBST(MOZ_PLACES)
 if test "$MOZ_PLACES"; then
   AC_DEFINE(MOZ_PLACES)
 fi
 
+dnl Build Sync Services if required
+AC_SUBST(MOZ_SERVICES_SYNC)
+if test -n "$MOZ_SERVICES_SYNC"; then
+  AC_DEFINE(MOZ_SERVICES_SYNC)
+fi
+
 dnl ========================================================
 if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
 fi
 
 if test "$MOZ_LDAP_XPCOM"; then
     LDAP_CFLAGS='-I${DIST}/public/ldap'
     if test "$OS_ARCH" = "WINNT"; then
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -51,16 +51,18 @@ include $(topsrcdir)/toolkit/toolkit-tie
 endif
 
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
+tier_app_dirs += services
+
 else # toplevel Makefile
 
 ifndef MOZ_ENABLE_LIBXUL
 SUBDIR=
 include $(topsrcdir)/bridge/bridge.mk
 tier_app_staticdirs += $(APP_LIBXUL_STATICDIRS)
 tier_app_dirs += $(APP_LIBXUL_DIRS)
 endif
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -53,8 +53,10 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/br
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_APP_COMPONENT_LIBS="mail msgsmime import xpautocomplete $LDAP_COMPONENT"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 MOZ_APP_COMPONENT_INCLUDE=nsSuiteComponents.h
+MOZ_SERVICES_SYNC=1
+
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -236,16 +236,17 @@
 @BINPATH@/components/pref.xpt
 @BINPATH@/components/prefetch.xpt
 @BINPATH@/components/profile.xpt
 @BINPATH@/components/proxyObject.xpt
 @BINPATH@/components/rdf.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/satchel.manifest
 @BINPATH@/components/saxparser.xpt
+@BINPATH@/components/services-crypto.xpt
 @BINPATH@/components/services-crypto-component.xpt
 @BINPATH@/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/smile.xpt
 @BINPATH@/components/spellchecker.xpt
 @BINPATH@/components/startupcache.xpt
 @BINPATH@/components/storage.xpt
 @BINPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
@@ -400,16 +401,19 @@
 @BINPATH@/components/pluginGlue.manifest
 @BINPATH@/components/smileApplication.js
 @BINPATH@/components/smileApplication.manifest
 @BINPATH@/components/storage-Legacy.js
 @BINPATH@/components/storage-mozStorage.js
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
 @BINPATH@/components/WebContentConverter.js
+@BINPATH@/components/nsAboutSyncTabs.js
+@BINPATH@/components/SyncComponents.manifest
+@BINPATH@/components/Weave.js
 
 ; Modules
 @BINPATH@/modules/*
 
 ; [Browser Chrome Files]
 @BINPATH@/chrome/comm@JAREXT@
 @BINPATH@/chrome/comm.manifest
 @BINPATH@/chrome/toolkit@JAREXT@
@@ -500,16 +504,17 @@
 #elifdef WIN_OR_OS2
 @BINPATH@/chrome/icons/default/venkman-window.ico
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/browser-prefs.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/@PREF_DIR@/services-sync.js
 @BINPATH@/@PREF_DIR@/composer.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 
 ; [Layout Engine Resources]
 ; Layout debug extension.
 #ifdef ENABLE_TESTS