Bug 818246 - Part 5: Move XPIDLSRCS into moz.build (manual); r=glandium

Brli · Mar 12, 2013 · 3a8e909 · 3a8e909
1 parent cabc285
commit 3a8e909
Show file tree

Hide file tree

Showing 50 changed files with 195 additions and 175 deletions.
diff --git a/browser/components/shell/public/Makefile.in b/browser/components/shell/public/Makefile.in
@@ -12,12 +12,4 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = shellservice
 
-ifeq ($(OS_ARCH),WINNT)
-XPIDLSRCS += nsIWindowsShellService.idl
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-XPIDLSRCS += nsIMacShellService.idl
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/shell/public/moz.build b/browser/components/shell/public/moz.build
@@ -7,3 +7,12 @@ XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsIMacShellService.idl',
+    ]
+
diff --git a/content/xul/content/public/Makefile.in b/content/xul/content/public/Makefile.in
@@ -11,10 +11,4 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xul
 
-ifdef MOZ_XUL
-XPIDLSRCS	= \
-		nsIXULContextMenuBuilder.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/xul/content/public/moz.build b/content/xul/content/public/moz.build
@@ -3,3 +3,8 @@
 # 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/.
 
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIXULContextMenuBuilder.idl',
+    ]
+
diff --git a/content/xul/document/public/Makefile.in b/content/xul/document/public/Makefile.in
@@ -14,10 +14,6 @@ MODULE		= xuldoc
 GRE_MODULE	= 1
 
 ifdef MOZ_XUL
-XPIDLSRCS += \
-		nsIXULOverlayProvider.idl \
-		$(NULL)
-
 EXPORTS		= \
 		nsIXULDocument.h \
 		$(NULL)

diff --git a/content/xul/document/public/moz.build b/content/xul/document/public/moz.build
@@ -8,3 +8,8 @@ XPIDL_SOURCES += [
     'nsIControllers.idl',
 ]
 
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIXULOverlayProvider.idl',
+    ]
+
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
@@ -62,15 +62,6 @@ ifdef MOZ_B2G_RIL
 CPPSRCS += BluetoothTelephonyListener.cpp
 endif
 
-XPIDLSRCS = \
-  nsIDOMNavigatorBluetooth.idl \
-  nsIDOMBluetoothManager.idl \
-  nsIDOMBluetoothAdapter.idl \
-  nsIDOMBluetoothDevice.idl \
-  nsIDOMBluetoothDeviceEvent.idl \
-  nsIDOMBluetoothDeviceAddressEvent.idl \
-  $(NULL)
-
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \
   $(srcdir)/linux \

diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
@@ -13,3 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if CONFIG['MOZ_B2G_BT']:
+    XPIDL_SOURCES += [
+        'nsIDOMNavigatorBluetooth.idl',
+        'nsIDOMBluetoothManager.idl',
+        'nsIDOMBluetoothAdapter.idl',
+        'nsIDOMBluetoothDevice.idl',
+        'nsIDOMBluetoothDeviceEvent.idl',
+        'nsIDOMBluetoothDeviceAddressEvent.idl',
+    ]
+
diff --git a/dom/interfaces/base/Makefile.in b/dom/interfaces/base/Makefile.in
@@ -14,22 +14,6 @@ MODULE		= dom
 XPIDL_MODULE	= dom_base
 GRE_MODULE	= 1
 
-ifdef MOZ_DISABLE_CRYPTOLEGACY
-XPIDLSRCS += \
-	nsIDOMCrypto.idl			\
-	$(NULL)
-else
-XPIDLSRCS += \
-	nsIDOMCryptoLegacy.idl			\
-	$(NULL)
-endif
-
-ifdef MOZ_B2G
-XPIDLSRCS += \
-	nsIDOMWindowB2G.idl \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += \

diff --git a/dom/interfaces/base/moz.build b/dom/interfaces/base/moz.build
@@ -43,3 +43,17 @@ XPIDL_SOURCES += [
     'nsITabParent.idl',
 ]
 
+if CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
+    XPIDL_SOURCES += [
+        'nsIDOMCrypto.idl',
+    ]
+else:
+    XPIDL_SOURCES += [
+        'nsIDOMCryptoLegacy.idl',
+    ]
+
+if CONFIG['MOZ_B2G']:
+    XPIDL_SOURCES += [
+        'nsIDOMWindowB2G.idl',
+    ]
+
diff --git a/dom/mobilemessage/interfaces/Makefile.in b/dom/mobilemessage/interfaces/Makefile.in
@@ -13,12 +13,6 @@ XPIDL_MODULE = dom_mobilemessage
 
 include $(topsrcdir)/dom/dom-config.mk
 
-ifdef MOZ_B2G_RIL
-XPIDLSRCS += \
-  nsIRilMobileMessageDatabaseService.idl \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += \

diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
@@ -17,3 +17,8 @@ XPIDL_SOURCES += [
     'nsISmsService.idl',
 ]
 
+if CONFIG['MOZ_B2G_RIL']:
+    XPIDL_SOURCES += [
+        'nsIRilMobileMessageDatabaseService.idl',
+    ]
+
diff --git a/dom/network/interfaces/Makefile.in b/dom/network/interfaces/Makefile.in
@@ -13,17 +13,6 @@ XPIDL_MODULE = dom_network
 
 include $(topsrcdir)/dom/dom-config.mk
 
-ifdef MOZ_B2G_RIL
-XPIDLSRCS += \
-  nsIDOMMobileConnection.idl \
-  nsIMobileConnectionProvider.idl \
-  nsINavigatorMobileConnection.idl \
-  nsIDOMNetworkStatsManager.idl \
-  nsIDOMNetworkStats.idl \
-  nsIDOMCFStateChangeEvent.idl \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += \

diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
@@ -13,3 +13,13 @@ XPIDL_SOURCES += [
     'nsITCPSocketParent.idl',
 ]
 
+if CONFIG['MOZ_B2G_RIL']:
+    XPIDL_SOURCES += [
+        'nsIDOMMobileConnection.idl',
+        'nsIMobileConnectionProvider.idl',
+        'nsINavigatorMobileConnection.idl',
+        'nsIDOMNetworkStatsManager.idl',
+        'nsIDOMNetworkStats.idl',
+        'nsIDOMCFStateChangeEvent.idl',
+    ]
+
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
@@ -36,11 +36,6 @@ CPPSRCS		= \
 		nsEmbedStream.cpp		\
 		$(NULL)
 
-ifdef NS_PRINTING
-SDK_XPIDLSRCS += nsIWebBrowserPrint.idl
-XPIDLSRCS     += nsIPrintingPrompt.idl nsIPrintingPromptService.idl
-endif
-
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1

diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build
@@ -21,3 +21,10 @@ XPIDL_SOURCES += [
     'nsIWebBrowserStream.idl',
 ]
 
+if CONFIG['NS_PRINTING']:
+    XPIDL_SOURCES += [
+        'nsIPrintingPrompt.idl',
+        'nsIPrintingPromptService.idl',
+        'nsIWebBrowserPrint.idl',
+    ]
+
diff --git a/extensions/pref/autoconfig/public/Makefile.in b/extensions/pref/autoconfig/public/Makefile.in
@@ -11,9 +11,5 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE       = autoconfig
 
-ifdef MOZ_LDAP_XPCOM
-XPIDLSRCS += nsILDAPSyncQuery.idl
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/extensions/pref/autoconfig/public/moz.build b/extensions/pref/autoconfig/public/moz.build
@@ -8,3 +8,8 @@ XPIDL_SOURCES += [
     'nsIReadConfig.idl',
 ]
 
+if CONFIG['MOZ_LDAP_XPCOM']:
+    XPIDL_SOURCES += [
+        'nsILDAPSyncQuery.idl',
+    ]
+
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
@@ -94,9 +94,6 @@ CPPSRCS		= \
 		$(NULL)
 
 ifndef MOZ_XUL
-XPIDLSRCS  += \
-		nsIBoxObject.idl \
-		$(NULL)
 EXPORTS    += \
 		nsPIBoxObject.h \
 		$(NULL)

diff --git a/layout/base/moz.build b/layout/base/moz.build
@@ -9,3 +9,8 @@ XPIDL_SOURCES += [
     'nsIStyleSheetService.idl',
 ]
 
+if not CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIBoxObject.idl',
+    ]
+
diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in
@@ -14,10 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= necko
 GRE_MODULE	= 1
 
-ifdef MOZ_TOOLKIT_SEARCH
-XPIDLSRCS	+= nsIBrowserSearchService.idl
-endif
-
 EXPORTS		= \
 		netCore.h \
 		nsNetUtil.h \

diff --git a/netwerk/base/public/moz.build b/netwerk/base/public/moz.build
@@ -108,3 +108,8 @@ XPIDL_SOURCES += [
     'nsPISocketTransportService.idl',
 ]
 
+if CONFIG['MOZ_TOOLKIT_SEARCH']:
+    XPIDL_SOURCES += [
+        'nsIBrowserSearchService.idl',
+    ]
+
diff --git a/netwerk/streamconv/public/Makefile.in b/netwerk/streamconv/public/Makefile.in
@@ -15,12 +15,6 @@ MODULE		= necko
 XPIDL_MODULE	= necko_strconv
 GRE_MODULE	= 1
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-XPIDLSRCS += \
-		nsIAppleFileDecoder.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build
@@ -12,3 +12,8 @@ XPIDL_SOURCES += [
     'nsITXTToHTMLConv.idl',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsIAppleFileDecoder.idl',
+    ]
+
diff --git a/security/manager/ssl/public/Makefile.in b/security/manager/ssl/public/Makefile.in
@@ -13,8 +13,4 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = pipnss
 GRE_MODULE	= 1
 
-ifdef MOZ_XUL
-XPIDLSRCS += nsICertTree.idl
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/public/moz.build b/security/manager/ssl/public/moz.build
@@ -57,3 +57,8 @@ XPIDL_SOURCES += [
     'nsIX509CertValidity.idl',
 ]
 
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsICertTree.idl',
+    ]
+
diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in
@@ -18,10 +18,6 @@ CPPSRCS = \
   $(NULL)
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 
-ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
-XPIDLSRCS += nsINotificationsList.idl
-endif
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build
@@ -13,3 +13,8 @@ XPIDL_SOURCES += [
     'nsIAlertsService.idl',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsINotificationsList.idl'
+    ]
+
diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
@@ -20,9 +20,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
-XPIDLSRCS = \
-  nsIFileView.idl \
-  $(NULL)
 CPPSRCS = \
   nsFileView.cpp \
   $(NULL)

diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build
@@ -3,3 +3,10 @@
 # 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/.
 
+if CONFIG['MOZ_XUL'] and \
+    CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
+
+        XPIDL_SOURCES += [
+            'nsIFileView.idl',
+        ]
+
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
@@ -18,21 +18,6 @@ EXPORT_LIBRARY = 1
 MODULE_NAME = nsPlacesModule
 IS_COMPONENT = 1
 
-XPIDLSRCS += \
-  mozIAsyncHistory.idl \
-  mozIAsyncFavicons.idl \
-  mozIAsyncLivemarks.idl \
-  mozIPlacesAutoComplete.idl \
-  mozIColorAnalyzer.idl \
-  nsIAnnotationService.idl \
-  nsIBrowserHistory.idl \
-  nsIFaviconService.idl \
-  nsINavBookmarksService.idl \
-  nsITaggingService.idl  \
-  nsPIPlacesDatabase.idl \
-  nsPIPlacesHistoryListenersNotifier.idl \
-  $(NULL)
-
 EXPORTS_NAMESPACES = mozilla/places
 
 EXPORTS_mozilla/places = \

diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build
@@ -10,3 +10,19 @@ XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
+if CONFIG['MOZ_PLACES']:
+    XPIDL_SOURCES += [
+        'mozIAsyncHistory.idl',
+        'mozIAsyncFavicons.idl',
+        'mozIAsyncLivemarks.idl',
+        'mozIPlacesAutoComplete.idl',
+        'mozIColorAnalyzer.idl',
+        'nsIAnnotationService.idl',
+        'nsIBrowserHistory.idl',
+        'nsIFaviconService.idl',
+        'nsINavBookmarksService.idl',
+        'nsITaggingService.idl ',
+        'nsPIPlacesDatabase.idl',
+        'nsPIPlacesHistoryListenersNotifier.idl',
+    ]
+