Bug 838526 make package broken due to missing packages (Port Firefox bugs: Bug 831683 and Bug 836206) r=mcsmurf.
authorPhilip Chee <philip.chee@gmail.com>
Thu, 07 Feb 2013 12:21:17 +0800
changeset 14814 ec86d80bfaf748dc06a35088430da19032640e8d
parent 14813 1f1db96d65716f6a1d80056b33abfcfe61990794
child 14815 6c463991fbfedddec516988bf6307c1931731986
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcsmurf
bugs838526, 831683, 836206
Bug 838526 make package broken due to missing packages (Port Firefox bugs: Bug 831683 and Bug 836206) r=mcsmurf. Firefox bugs: Bug 831683 B2G SMS & B2G MMS: make SMS database more generic for MMS (part 2, create dom/mobilemessage to put DB codes). Bug 836206 Remove AITC client.
suite/confvars.sh
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -27,17 +27,16 @@ MOZ_HELP_VIEWER=1
 MOZ_MEDIA_NAVIGATOR=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
 MOZ_APP_COMPONENT_LIBS="xpautocomplete $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
 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_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -185,16 +185,17 @@
 @BINPATH@/components/dom_events.xpt
 @BINPATH@/components/dom_file.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_indexeddb.xpt
 @BINPATH@/components/dom_json.xpt
 @BINPATH@/components/dom_loadsave.xpt
 @BINPATH@/components/dom_media.xpt
+@BINPATH@/components/dom_mobilemessage.xpt
 @BINPATH@/components/dom_network.xpt
 @BINPATH@/components/dom_notification.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_permissionsettings.xpt
 @BINPATH@/components/dom_power.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_settings.xpt
 @BINPATH@/components/dom_sidebar.xpt
@@ -335,20 +336,16 @@
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
 ; 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
 @BINPATH@/components/amWebInstallListener.js
 @BINPATH@/components/AppsService.js
 @BINPATH@/components/AppsService.manifest
 @BINPATH@/components/BrowserElementParent.js
 @BINPATH@/components/BrowserElementParent.manifest
@@ -575,19 +572,16 @@
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/browser-prefs.js
 #ifdef LIBXUL_SDK
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 #endif
-#ifdef MOZ_SERVICES_AITC
-@BINPATH@/@PREF_DIR@/services-aitc.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
 @BINPATH@/defaults/autoconfig/prefcalls.js
 #ifndef LIBXUL_SDK
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -1127,26 +1127,22 @@ xpicleanup@BIN_SUFFIX@
   res/entityTables/html40Symbols.properties
   res/entityTables/htmlEntityVersions.properties
   res/entityTables/mathml20.properties
   res/entityTables/transliterate.properties
   #ifdef MOZ_UPDATER
     update.locale
   #endif
 #else
-  #ifndef MOZ_SERVICES_AITC
-    components/Aitc.js
-  #endif
+  components/Aitc.js
   components/binary.manifest
   #ifndef MOZ_SERVICES_SYNC
     components/Weave.js
   #endif
-  #ifndef MOZ_SERVICES_AITC
-    defaults/pref/services-aitc.js
-  #endif
+  defaults/pref/services-aitc.js
   defaults/pref/services-notifications.js
   #ifndef MOZ_SERVICES_SYNC
     defaults/pref/services-sync.js
   #endif
   omni.ja
 #endif
 
 ; pre-libxul static mail library