Port Bug 1257326 to SeaMonkey (Move "feature flags" to Python configure) r=Ratty a=Ratty CLOSED TREE
☠☠ backed out by 001cac7a024e ☠ ☠
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 14 May 2016 15:32:32 +0200
changeset 25014 ffe919976f1b07ef939a66bf15bd255e6a3dd66f
parent 25013 29b988292b2057ab0ae5542f10931b9cddef66e3
child 25015 001cac7a024ebbe9dea0549ed661997a1097f4e1
push id1688
push userclokep@gmail.com
push dateMon, 01 Aug 2016 16:45:40 +0000
treeherdercomm-beta@9abd7cedb2af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, Ratty
bugs1257326
Port Bug 1257326 to SeaMonkey (Move "feature flags" to Python configure) r=Ratty a=Ratty CLOSED TREE Parts of the patch contributed by ratty and aleth.
suite/confvars.sh
suite/installer/package-manifest.in
suite/installer/removed-files.in
suite/moz.configure
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -21,21 +21,17 @@ MOZ_UPDATER=1
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_HELP_VIEWER=1
 MOZ_MORK=1
 # Enable navigator.mozPay
 MOZ_PAY=1
 MOZ_SAFE_BROWSING=1
-MOZ_SERVICES_COMMON=1
-MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_FXACCOUNTS=1
-MOZ_SERVICES_SYNC=1
-MOZ_SERVICES_CLOUDSYNC=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_URL_CLASSIFIER=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_WEBM_ENCODER=1
 MOZ_BINARY_EXTENSIONS=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -517,27 +517,23 @@
 @RESPATH@/components/SiteSpecificUserAgent.manifest
 @RESPATH@/components/SlowScriptDebug.js
 @RESPATH@/components/SlowScriptDebug.manifest
 @RESPATH@/components/smileApplication.js
 @RESPATH@/components/smileApplication.manifest
 @RESPATH@/components/storage-json.js
 @RESPATH@/components/SuiteProfileMigrator.js
 @RESPATH@/components/SuiteProfileMigrator.manifest
-#ifdef MOZ_SERVICES_SYNC
 @RESPATH@/components/SyncComponents.manifest
-#endif
 @RESPATH@/components/TooltipTextProvider.js
 @RESPATH@/components/TooltipTextProvider.manifest
 @RESPATH@/components/txEXSLTRegExFunctions.js
 @RESPATH@/components/txEXSLTRegExFunctions.manifest
 @RESPATH@/components/UnifiedComplete.js
-#ifdef MOZ_SERVICES_SYNC
 @RESPATH@/components/Weave.js
-#endif
 @RESPATH@/components/Webapps.js
 @RESPATH@/components/Webapps.manifest
 @RESPATH@/components/webideCli.js
 @RESPATH@/components/webideComponents.manifest
 @RESPATH@/components/WebContentConverter.js
 @RESPATH@/components/WebVTT.manifest
 @RESPATH@/components/WebVTTParserWrapper.js
 @RESPATH@/components/XULStore.js
@@ -641,19 +637,17 @@
 @RESPATH@/chrome/icons/default/script-file.ico
 @RESPATH@/chrome/icons/default/xml-file.ico
 @RESPATH@/chrome/icons/default/xul-file.ico
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @RESPATH@/@PREF_DIR@/browser-prefs.js
-#ifdef MOZ_SERVICES_SYNC
 @RESPATH@/@PREF_DIR@/services-sync.js
-#endif
 @RESPATH@/@PREF_DIR@/composer.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/defaults/permissions
 ; Warning: changing the path to channel-prefs.js can cause bugs. (Bug 756325)
 @RESPATH@/defaults/pref/channel-prefs.js
 
 ; [Layout Engine Resources]
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -1135,24 +1135,20 @@ Throbber-small.gif
   @DIR_MACOS@res/entityTables/mathml20.properties
   @DIR_MACOS@res/entityTables/transliterate.properties
   #ifdef MOZ_UPDATER
     @DIR_MACOS@update.locale
   #endif
 #else
   @DIR_MACOS@components/Aitc.js
   @DIR_MACOS@components/binary.manifest
-  #ifndef MOZ_SERVICES_SYNC
-    @DIR_MACOS@components/Weave.js
-  #endif
+  @DIR_MACOS@components/Weave.js
   @DIR_MACOS@defaults/pref/services-aitc.js
   @DIR_MACOS@defaults/pref/services-notifications.js
-  #ifndef MOZ_SERVICES_SYNC
-    @DIR_MACOS@defaults/pref/services-sync.js
-  #endif
+  @DIR_MACOS@defaults/pref/services-sync.js
   @DIR_MACOS@omni.ja
 #endif
 
 ; pre-libxul static mail library
 @DIR_MACOS@components/@DLL_PREFIX@mail@DLL_SUFFIX@
 ; shared mail libraries
 @DIR_MACOS@components/@DLL_PREFIX@addrbook@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@bayesflt@DLL_SUFFIX@
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -1,7 +1,11 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-include('../mozilla/toolkit/moz.configure')
\ No newline at end of file
+imply_option('MOZ_PLACES', True)
+imply_option('MOZ_SERVICES_SYNC', True)
+imply_option('MOZ_SERVICES_CLOUDSYNC', True)
+
+include('../mozilla/toolkit/moz.configure')