Bug 1266995 - Use unique XPIDL_MODULE for each moz.build; r?glandium
There were a few moz.build files specifying the same XPIDL_MODULE
value. Probably the craziest was timermanager's, which specified the
"update" module!
In preparation for making the xpt filename derived from the relative
source directory, we make all XPIDL_MODULE values unique so each
directory has its own xpt. This will make automatic conversion of
package-manifest.in easier.
MozReview-Commit-ID: 5nVgsccm3Zi
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -170,16 +170,17 @@
#endif
@RESPATH@/components/dom_canvas.xpt
@RESPATH@/components/dom_contacts.xpt
@RESPATH@/components/dom_alarm.xpt
@RESPATH@/components/dom_core.xpt
@RESPATH@/components/dom_css.xpt
@RESPATH@/components/dom_events.xpt
@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_ipc.xpt
@RESPATH@/components/dom_media.xpt
@RESPATH@/components/dom_network.xpt
#ifdef MOZ_SECUREELEMENT
@RESPATH@/components/dom_secureelement.xpt
#endif
#ifdef MOZ_NFC
@RESPATH@/components/dom_nfc.xpt
#endif
@@ -238,16 +239,17 @@
@RESPATH@/components/imglib2.xpt
@RESPATH@/components/inspector.xpt
@RESPATH@/components/intl.xpt
@RESPATH@/components/jar.xpt
@RESPATH@/components/jsdebugger.xpt
@RESPATH@/components/jsdownloads.xpt
@RESPATH@/components/jsinspector.xpt
@RESPATH@/components/layout_base.xpt
+@RESPATH@/components/layout_style.xpt
#ifdef NS_PRINTING
@RESPATH@/components/layout_printing.xpt
#endif
@RESPATH@/components/layout_xul_tree.xpt
@RESPATH@/components/layout_xul.xpt
@RESPATH@/components/locale.xpt
@RESPATH@/components/lwbrk.xpt
#ifdef MOZ_ENABLE_PROFILER_SPS
@@ -263,16 +265,17 @@
@RESPATH@/components/necko_dns.xpt
@RESPATH@/components/necko_file.xpt
@RESPATH@/components/necko_ftp.xpt
@RESPATH@/components/necko_http.xpt
@RESPATH@/components/necko_mdns.xpt
@RESPATH@/components/necko_res.xpt
@RESPATH@/components/necko_socket.xpt
@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_streamconv_converters.xpt
@RESPATH@/components/necko_viewsource.xpt
@RESPATH@/components/necko_websocket.xpt
@RESPATH@/components/necko_wifi.xpt
@RESPATH@/components/necko_wyciwyg.xpt
#ifdef MOZ_RTSP
@RESPATH@/components/necko_rtsp.xpt
#endif
@RESPATH@/components/necko.xpt
@@ -305,16 +308,17 @@
@RESPATH@/components/telemetry.xpt
@RESPATH@/components/toolkit_asyncshutdown.xpt
@RESPATH@/components/toolkit_filewatcher.xpt
@RESPATH@/components/toolkit_finalizationwitness.xpt
@RESPATH@/components/toolkit_formautofill.xpt
@RESPATH@/components/toolkit_osfile.xpt
@RESPATH@/components/toolkit_securityreporter.xpt
@RESPATH@/components/toolkit_perfmonitoring.xpt
+@RESPATH@/components/toolkit_components_timermanager.xpt
@RESPATH@/components/toolkit_xulstore.xpt
@RESPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE
@RESPATH@/components/toolkitremote.xpt
#endif
@RESPATH@/components/txtsvc.xpt
@RESPATH@/components/txmgr.xpt
#ifdef MOZ_USE_NATIVE_UCONV
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -184,16 +184,17 @@
@RESPATH@/components/dom_css.xpt
@RESPATH@/components/dom_events.xpt
@RESPATH@/components/dom_geolocation.xpt
@RESPATH@/components/dom_media.xpt
@RESPATH@/components/dom_network.xpt
@RESPATH@/components/dom_notification.xpt
@RESPATH@/components/dom_html.xpt
@RESPATH@/components/dom_icc.xpt
+@RESPATH@/components/dom_ipc.xpt
@RESPATH@/components/dom_offline.xpt
@RESPATH@/components/dom_json.xpt
@RESPATH@/components/dom_power.xpt
@RESPATH@/components/dom_push.xpt
@RESPATH@/components/dom_quota.xpt
@RESPATH@/components/dom_range.xpt
@RESPATH@/components/dom_security.xpt
@RESPATH@/components/dom_settings.xpt
@@ -238,16 +239,17 @@
@RESPATH@/components/imglib2.xpt
@RESPATH@/components/inspector.xpt
@RESPATH@/components/intl.xpt
@RESPATH@/components/jar.xpt
@RESPATH@/components/jsdebugger.xpt
@RESPATH@/components/jsdownloads.xpt
@RESPATH@/browser/components/jsinspector.xpt
@RESPATH@/components/layout_base.xpt
+@RESPATH@/components/layout_style.xpt
#ifdef NS_PRINTING
@RESPATH@/components/layout_printing.xpt
#endif
@RESPATH@/components/layout_xul_tree.xpt
@RESPATH@/components/layout_xul.xpt
@RESPATH@/components/locale.xpt
@RESPATH@/components/lwbrk.xpt
#ifdef MOZ_ENABLE_PROFILER_SPS
@@ -263,16 +265,17 @@
@RESPATH@/components/necko_dns.xpt
@RESPATH@/components/necko_file.xpt
@RESPATH@/components/necko_ftp.xpt
@RESPATH@/components/necko_http.xpt
@RESPATH@/components/necko_mdns.xpt
@RESPATH@/components/necko_res.xpt
@RESPATH@/components/necko_socket.xpt
@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_streamconv_converters.xpt
@RESPATH@/components/necko_viewsource.xpt
@RESPATH@/components/necko_websocket.xpt
#ifdef NECKO_WIFI
@RESPATH@/components/necko_wifi.xpt
#endif
@RESPATH@/components/necko_wyciwyg.xpt
@RESPATH@/components/necko.xpt
@RESPATH@/components/loginmgr.xpt
@@ -299,16 +302,17 @@
@RESPATH@/components/storage.xpt
@RESPATH@/components/toolkit_asyncshutdown.xpt
@RESPATH@/components/toolkit_filewatcher.xpt
@RESPATH@/components/toolkit_finalizationwitness.xpt
@RESPATH@/components/toolkit_formautofill.xpt
@RESPATH@/components/toolkit_osfile.xpt
@RESPATH@/components/toolkit_securityreporter.xpt
@RESPATH@/components/toolkit_perfmonitoring.xpt
+@RESPATH@/components/toolkit_components_timermanager.xpt
@RESPATH@/components/toolkit_xulstore.xpt
@RESPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE
@RESPATH@/components/toolkitremote.xpt
#endif
@RESPATH@/components/txtsvc.xpt
@RESPATH@/components/txmgr.xpt
@RESPATH@/components/uconv.xpt
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -3,17 +3,17 @@
# 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 += [
'nsIHangReport.idl',
]
-XPIDL_MODULE = 'dom'
+XPIDL_MODULE = 'dom_ipc'
EXPORTS += [
'nsICachedFileDescriptorListener.h',
]
EXPORTS.mozilla.dom.ipc += [
'BlobChild.h',
'BlobParent.h',
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -21,17 +21,17 @@ with Files('nsDOM*'):
DIRS += ['xbl-marquee']
TEST_DIRS += ['test']
XPIDL_SOURCES += [
'nsICSSUnprefixingService.idl',
]
-XPIDL_MODULE = 'layout_base'
+XPIDL_MODULE = 'layout_style'
EXPORTS += [
'!nsStyleStructList.h',
'AnimationCommon.h',
'CounterStyleManager.h',
'nsAnimationManager.h',
'nsComputedDOMStylePropertyList.h',
'nsCSSAnonBoxes.h',
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -114,16 +114,17 @@
@BINPATH@/components/dom_apps.xpt
@BINPATH@/components/dom_newapps.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_canvas.xpt
@BINPATH@/components/dom_core.xpt
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_events.xpt
@BINPATH@/components/dom_geolocation.xpt
+@BINPATH@/components/dom_ipc.xpt
@BINPATH@/components/dom_media.xpt
@BINPATH@/components/dom_messages.xpt
@BINPATH@/components/dom_network.xpt
@BINPATH@/components/dom_notification.xpt
@BINPATH@/components/dom_html.xpt
@BINPATH@/components/dom_offline.xpt
@BINPATH@/components/dom_json.xpt
@BINPATH@/components/dom_power.xpt
@@ -167,16 +168,17 @@
@BINPATH@/components/imglib2.xpt
@BINPATH@/components/inspector.xpt
@BINPATH@/components/intl.xpt
@BINPATH@/components/jar.xpt
@BINPATH@/components/jsdebugger.xpt
@BINPATH@/components/jsdownloads.xpt
@BINPATH@/components/jsinspector.xpt
@BINPATH@/components/layout_base.xpt
+@BINPATH@/components/layout_style.xpt
#ifdef NS_PRINTING
@BINPATH@/components/layout_printing.xpt
#endif
@BINPATH@/components/layout_xul_tree.xpt
@BINPATH@/components/layout_xul.xpt
@BINPATH@/components/locale.xpt
@BINPATH@/components/lwbrk.xpt
#ifdef MOZ_ENABLE_PROFILER_SPS
@@ -191,16 +193,17 @@
@BINPATH@/components/necko_dns.xpt
@BINPATH@/components/necko_file.xpt
@BINPATH@/components/necko_ftp.xpt
@BINPATH@/components/necko_http.xpt
@BINPATH@/components/necko_mdns.xpt
@BINPATH@/components/necko_res.xpt
@BINPATH@/components/necko_socket.xpt
@BINPATH@/components/necko_strconv.xpt
+@BINPATH@/components/necko_streamconv_converters.xpt
@BINPATH@/components/necko_viewsource.xpt
@BINPATH@/components/necko_websocket.xpt
#ifdef NECKO_WIFI
@BINPATH@/components/necko_wifi.xpt
#endif
@BINPATH@/components/necko_wyciwyg.xpt
@BINPATH@/components/necko.xpt
@BINPATH@/components/loginmgr.xpt
@@ -225,16 +228,17 @@
@BINPATH@/components/telemetry.xpt
@BINPATH@/components/toolkit_asyncshutdown.xpt
@BINPATH@/components/toolkit_filewatcher.xpt
@BINPATH@/components/toolkit_finalizationwitness.xpt
@BINPATH@/components/toolkit_formautofill.xpt
@BINPATH@/components/toolkit_osfile.xpt
@BINPATH@/components/toolkit_securityreporter.xpt
@BINPATH@/components/toolkit_perfmonitoring.xpt
+@BINPATH@/components/toolkit_components_timermanager.xpt
@BINPATH@/components/toolkit_xulstore.xpt
@BINPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE
@BINPATH@/components/toolkitremote.xpt
#endif
@BINPATH@/components/txtsvc.xpt
@BINPATH@/components/txmgr.xpt
@BINPATH@/components/uconv.xpt
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -3,17 +3,17 @@
# 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 += [
'nsICompressConvStats.idl'
]
-XPIDL_MODULE = 'necko_http'
+XPIDL_MODULE = 'necko_streamconv_converters'
UNIFIED_SOURCES += [
'mozTXTToHTMLConv.cpp',
'nsDirIndex.cpp',
'nsDirIndexParser.cpp',
'nsHTTPCompressConv.cpp',
'nsIndexedToHTML.cpp',
'nsMultiMixedConv.cpp',
--- a/toolkit/components/timermanager/moz.build
+++ b/toolkit/components/timermanager/moz.build
@@ -1,15 +1,15 @@
# -*- 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_MODULE = 'update'
+XPIDL_MODULE = 'toolkit_components_timermanager'
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
XPIDL_SOURCES += [
'nsIUpdateTimerManager.idl',
]
EXTRA_COMPONENTS += [