Bug 871944 - move dom/mms/* to dom/mobilemessage/*. r=gene
authorVicamo Yang <vyang@mozilla.com>
Mon, 27 May 2013 11:18:50 +0800
changeset 144525 211b562004015b4195262d3d10098b1649392c90
parent 144524 7c6be1bed3d515ffede5cad3b96c160123e55422
child 144526 a34c219c6b5289d9329d3273e71eea4585a33e49
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgene
bugs871944
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 871944 - move dom/mms/* to dom/mobilemessage/*. r=gene
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
dom/mms/interfaces/moz.build
dom/mms/interfaces/nsIMmsService.idl
dom/mms/interfaces/nsIWapPushApplication.idl
dom/mms/moz.build
dom/mms/src/Makefile.in
dom/mms/src/moz.build
dom/mms/src/ril/MmsPduHelper.jsm
dom/mms/src/ril/MmsService.js
dom/mms/src/ril/MmsService.manifest
dom/mms/src/ril/WapPushManager.js
dom/mms/src/ril/WspPduHelper.jsm
dom/mms/src/ril/mms_consts.js
dom/mms/src/ril/wap_consts.js
dom/mms/tests/header_helpers.js
dom/mms/tests/test_mms_pdu_helper.js
dom/mms/tests/test_mms_service.js
dom/mms/tests/test_wsp_pdu_helper.js
dom/mms/tests/xpcshell.ini
dom/mobilemessage/interfaces/moz.build
dom/mobilemessage/interfaces/nsIMmsService.idl
dom/mobilemessage/interfaces/nsIWapPushApplication.idl
dom/mobilemessage/src/Makefile.in
dom/mobilemessage/src/ril/MmsPduHelper.jsm
dom/mobilemessage/src/ril/MmsService.js
dom/mobilemessage/src/ril/MmsService.manifest
dom/mobilemessage/src/ril/WapPushManager.js
dom/mobilemessage/src/ril/WspPduHelper.jsm
dom/mobilemessage/src/ril/mms_consts.js
dom/mobilemessage/src/ril/wap_consts.js
dom/mobilemessage/tests/header_helpers.js
dom/mobilemessage/tests/test_mms_pdu_helper.js
dom/mobilemessage/tests/test_mms_service.js
dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
dom/mobilemessage/tests/test_wsp_pdu_helper.js
dom/mobilemessage/tests/xpcshell.ini
dom/moz.build
testing/xpcshell/xpcshell.ini
testing/xpcshell/xpcshell_android.ini
testing/xpcshell/xpcshell_b2g.ini
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -192,19 +192,16 @@
 @BINPATH@/components/dom_network.xpt
 @BINPATH@/components/dom_notification.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_indexeddb.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_payment.xpt
 @BINPATH@/components/dom_push.xpt
 @BINPATH@/components/dom_json.xpt
-#ifdef MOZ_B2G_RIL
-@BINPATH@/components/dom_mms.xpt
-#endif
 @BINPATH@/components/dom_browserelement.xpt
 @BINPATH@/components/dom_messages.xpt
 @BINPATH@/components/dom_power.xpt
 @BINPATH@/components/dom_quota.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_settings.xpt
 @BINPATH@/components/dom_permissionsettings.xpt
 @BINPATH@/components/dom_sidebar.xpt
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -192,19 +192,16 @@
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_media.xpt
 @BINPATH@/components/dom_network.xpt
 @BINPATH@/components/dom_notification.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_indexeddb.xpt
 @BINPATH@/components/dom_offline.xpt
 @BINPATH@/components/dom_json.xpt
-#ifdef MOZ_B2G_RIL
-@BINPATH@/components/dom_mms.xpt
-#endif
 @BINPATH@/components/dom_browserelement.xpt
 @BINPATH@/components/dom_power.xpt
 @BINPATH@/components/dom_quota.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_settings.xpt
 @BINPATH@/components/dom_permissionsettings.xpt
 @BINPATH@/components/dom_sidebar.xpt
 @BINPATH@/components/dom_mobilemessage.xpt
deleted file mode 100644
--- a/dom/mms/interfaces/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- 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/.
-
-XPIDL_SOURCES += [
-    'nsIMmsService.idl',
-    'nsIWapPushApplication.idl',
-]
-
-XPIDL_MODULE = 'dom_mms'
-
deleted file mode 100644
--- a/dom/mms/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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/.
-
-PARALLEL_DIRS += ['interfaces', 'src']
-
-if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
deleted file mode 100644
--- a/dom/mms/src/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/.
-
-DEPTH            = @DEPTH@
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = \
-  $(srcdir) \
-  $(NULL)
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_B2G_RIL
-EXTRA_COMPONENTS = \
-  ril/MmsService.js \
-  ril/MmsService.manifest \
-  $(NULL)
-
-EXTRA_JS_MODULES = \
-  ril/mms_consts.js \
-  ril/MmsPduHelper.jsm \
-  ril/wap_consts.js \
-  ril/WapPushManager.js \
-  ril/WspPduHelper.jsm \
-  $(NULL)
-endif
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/dom/mms/src/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- 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/.
-
deleted file mode 100644
--- a/dom/mms/tests/xpcshell.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-head = header_helpers.js
-tail =
-
-[test_wsp_pdu_helper.js]
-[test_mms_pdu_helper.js]
-[test_mms_service.js]
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -11,21 +11,23 @@ XPIDL_SOURCES += [
     'nsIDOMMozMobileMessageThread.idl',
     'nsIDOMMozSmsEvent.idl',
     'nsIDOMMozSmsMessage.idl',
     'nsIDOMNavigatorMobileMessage.idl',
     'nsIDOMNavigatorSms.idl',
     'nsIDOMSmsFilter.idl',
     'nsIDOMSmsManager.idl',
     'nsIDOMSmsSegmentInfo.idl',
+    'nsIMmsService.idl',
     'nsIMobileMessageCallback.idl',
     'nsIMobileMessageCursorCallback.idl',
     'nsIMobileMessageDatabaseService.idl',
     'nsIMobileMessageService.idl',
     'nsISmsService.idl',
+    'nsIWapPushApplication.idl',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIRilMobileMessageDatabaseService.idl',
     ]
 
 XPIDL_MODULE = 'dom_mobilemessage'
rename from dom/mms/interfaces/nsIMmsService.idl
rename to dom/mobilemessage/interfaces/nsIMmsService.idl
rename from dom/mms/interfaces/nsIWapPushApplication.idl
rename to dom/mobilemessage/interfaces/nsIWapPushApplication.idl
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -58,19 +58,29 @@ LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 ifdef MOZ_B2G_RIL
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/telephony \
   -I$(topsrcdir)/dom/system/gonk \
   $(NULL)
 
 EXTRA_COMPONENTS = \
+  ril/MmsService.js \
+  ril/MmsService.manifest \
   ril/MobileMessageDatabaseService.js \
   ril/MobileMessageDatabaseService.manifest \
   $(NULL)
+
+EXTRA_JS_MODULES = \
+  ril/mms_consts.js \
+  ril/MmsPduHelper.jsm \
+  ril/wap_consts.js \
+  ril/WapPushManager.js \
+  ril/WspPduHelper.jsm \
+  $(NULL)
 else
 CPPSRCS += \
   MobileMessageDatabaseService.cpp \
   MmsService.cpp \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/config.mk
rename from dom/mms/src/ril/MmsPduHelper.jsm
rename to dom/mobilemessage/src/ril/MmsPduHelper.jsm
rename from dom/mms/src/ril/MmsService.js
rename to dom/mobilemessage/src/ril/MmsService.js
rename from dom/mms/src/ril/MmsService.manifest
rename to dom/mobilemessage/src/ril/MmsService.manifest
rename from dom/mms/src/ril/WapPushManager.js
rename to dom/mobilemessage/src/ril/WapPushManager.js
rename from dom/mms/src/ril/WspPduHelper.jsm
rename to dom/mobilemessage/src/ril/WspPduHelper.jsm
rename from dom/mms/src/ril/mms_consts.js
rename to dom/mobilemessage/src/ril/mms_consts.js
rename from dom/mms/src/ril/wap_consts.js
rename to dom/mobilemessage/src/ril/wap_consts.js
rename from dom/mms/tests/header_helpers.js
rename to dom/mobilemessage/tests/header_helpers.js
rename from dom/mms/tests/test_mms_pdu_helper.js
rename to dom/mobilemessage/tests/test_mms_pdu_helper.js
rename from dom/mms/tests/test_mms_service.js
rename to dom/mobilemessage/tests/test_mms_service.js
--- a/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
+++ b/dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
@@ -1,13 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
 function do_check_throws(f, result, stack) {
   if (!stack) {
     stack = Components.stack.caller;
   }
 
   try {
     f();
   } catch (exc) {
rename from dom/mms/tests/test_wsp_pdu_helper.js
rename to dom/mobilemessage/tests/test_wsp_pdu_helper.js
--- a/dom/mobilemessage/tests/xpcshell.ini
+++ b/dom/mobilemessage/tests/xpcshell.ini
@@ -1,5 +1,11 @@
 [DEFAULT]
-head = 
+head = header_helpers.js
 tail = 
 
 [test_smsservice_createsmsmessage.js]
+[test_wsp_pdu_helper.js]
+run-if = toolkit == "gonk"
+[test_mms_pdu_helper.js]
+run-if = toolkit == "gonk"
+[test_mms_service.js]
+run-if = toolkit == "gonk"
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -52,17 +52,16 @@ PARALLEL_DIRS += [
     'file',
     'media',
     'messages',
     'power',
     'push',
     'quota',
     'settings',
     'mobilemessage',
-    'mms',
     'src',
     'time',
     'locales',
     'network',
     'permission',
     'plugins/base',
     'plugins/ipc',
     'indexedDB',
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -9,17 +9,16 @@
 [include:uriloader/exthandler/tests/unit/xpcshell.ini]
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/network/tests/unit_ipc/xpcshell.ini]
 [include:dom/network/tests/unit_stats/xpcshell.ini]
 [include:dom/payment/tests/unit/xpcshell.ini]
 [include:dom/permission/tests/unit/xpcshell.ini]
 [include:dom/src/json/test/unit/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
 [include:dom/tests/unit/xpcshell.ini]
--- a/testing/xpcshell/xpcshell_android.ini
+++ b/testing/xpcshell/xpcshell_android.ini
@@ -7,17 +7,16 @@
 [include:netwerk/cookie/test/unit/xpcshell.ini]
 [include:modules/libjar/zipwriter/test/unit/xpcshell.ini]
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/activities/tests/unit/xpcshell.ini]
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/encoding/test/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/network/tests/unit/xpcshell.ini]
 [include:dom/payment/tests/unit/xpcshell.ini]
 [include:dom/permission/tests/unit/xpcshell.ini]
 [include:dom/src/json/test/unit/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
 [include:dom/tests/unit/xpcshell.ini]
 [include:dom/indexedDB/test/unit/xpcshell.ini]
 [include:embedding/tests/unit/xpcshell.ini]
--- a/testing/xpcshell/xpcshell_b2g.ini
+++ b/testing/xpcshell/xpcshell_b2g.ini
@@ -1,15 +1,14 @@
 ; 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:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
-[include:dom/mms/tests/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
 [include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
 [include:toolkit/mozapps/downloads/tests/unit/xpcshell.ini]
 [include:toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini]
 [include:toolkit/mozapps/update/test_svc/unit/xpcshell.ini]
 [include:toolkit/mozapps/update/test/unit/xpcshell.ini]
 [include:toolkit/mozapps/shared/test/unit/xpcshell.ini]