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

This commit is contained in:
Gregory Szorc 2013-03-12 10:20:41 -07:00
parent 7bb3ee056b
commit 8b4f575df1
50 changed files with 195 additions and 175 deletions

View File

@ -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

View File

@ -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',
]

View File

@ -11,10 +11,4 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xul
ifdef MOZ_XUL
XPIDLSRCS = \
nsIXULContextMenuBuilder.idl \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

View File

@ -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',
]

View File

@ -14,10 +14,6 @@ MODULE = xuldoc
GRE_MODULE = 1
ifdef MOZ_XUL
XPIDLSRCS += \
nsIXULOverlayProvider.idl \
$(NULL)
EXPORTS = \
nsIXULDocument.h \
$(NULL)

View File

@ -8,3 +8,8 @@ XPIDL_SOURCES += [
'nsIControllers.idl',
]
if CONFIG['MOZ_XUL']:
XPIDL_SOURCES += [
'nsIXULOverlayProvider.idl',
]

View File

@ -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 \

View File

@ -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',
]

View File

@ -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 += \

View File

@ -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',
]

View File

@ -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 += \

View File

@ -17,3 +17,8 @@ XPIDL_SOURCES += [
'nsISmsService.idl',
]
if CONFIG['MOZ_B2G_RIL']:
XPIDL_SOURCES += [
'nsIRilMobileMessageDatabaseService.idl',
]

View File

@ -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 += \

View File

@ -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',
]

View File

@ -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

View File

@ -21,3 +21,10 @@ XPIDL_SOURCES += [
'nsIWebBrowserStream.idl',
]
if CONFIG['NS_PRINTING']:
XPIDL_SOURCES += [
'nsIPrintingPrompt.idl',
'nsIPrintingPromptService.idl',
'nsIWebBrowserPrint.idl',
]

View File

@ -11,9 +11,5 @@ include $(DEPTH)/config/autoconf.mk
MODULE = autoconfig
ifdef MOZ_LDAP_XPCOM
XPIDLSRCS += nsILDAPSyncQuery.idl
endif
include $(topsrcdir)/config/rules.mk

View File

@ -8,3 +8,8 @@ XPIDL_SOURCES += [
'nsIReadConfig.idl',
]
if CONFIG['MOZ_LDAP_XPCOM']:
XPIDL_SOURCES += [
'nsILDAPSyncQuery.idl',
]

View File

@ -94,9 +94,6 @@ CPPSRCS = \
$(NULL)
ifndef MOZ_XUL
XPIDLSRCS += \
nsIBoxObject.idl \
$(NULL)
EXPORTS += \
nsPIBoxObject.h \
$(NULL)

View File

@ -9,3 +9,8 @@ XPIDL_SOURCES += [
'nsIStyleSheetService.idl',
]
if not CONFIG['MOZ_XUL']:
XPIDL_SOURCES += [
'nsIBoxObject.idl',
]

View File

@ -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 \

View File

@ -108,3 +108,8 @@ XPIDL_SOURCES += [
'nsPISocketTransportService.idl',
]
if CONFIG['MOZ_TOOLKIT_SEARCH']:
XPIDL_SOURCES += [
'nsIBrowserSearchService.idl',
]

View File

@ -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

View File

@ -12,3 +12,8 @@ XPIDL_SOURCES += [
'nsITXTToHTMLConv.idl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += [
'nsIAppleFileDecoder.idl',
]

View File

@ -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

View File

@ -57,3 +57,8 @@ XPIDL_SOURCES += [
'nsIX509CertValidity.idl',
]
if CONFIG['MOZ_XUL']:
XPIDL_SOURCES += [
'nsICertTree.idl',
]

View File

@ -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

View File

@ -13,3 +13,8 @@ XPIDL_SOURCES += [
'nsIAlertsService.idl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += [
'nsINotificationsList.idl'
]

View File

@ -20,9 +20,6 @@ EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
LIBXUL_LIBRARY = 1
XPIDLSRCS = \
nsIFileView.idl \
$(NULL)
CPPSRCS = \
nsFileView.cpp \
$(NULL)

View File

@ -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',
]

View File

@ -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 = \

View File

@ -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',
]

View File

@ -18,8 +18,6 @@ EXTRA_COMPONENTS = \
ifdef MOZ_UPDATER
XPIDLSRCS += nsIUpdateService.idl
EXTRA_PP_COMPONENTS += \
nsUpdateService.js \
$(NULL)

View File

@ -15,6 +15,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
TEST_DIRS += ['test_timermanager']
XPIDL_SOURCES += [
'nsIUpdateTimerManager.idl',
]
# Update tests require the updater binary
if CONFIG['MOZ_UPDATER']:
TEST_DIRS += ['test']
@ -22,7 +26,7 @@ if CONFIG['MOZ_UPDATER']:
if CONFIG['MOZ_MAINTENANCE_SERVICE']:
TEST_DIRS += ['test_svc']
XPIDL_SOURCES += [
'nsIUpdateTimerManager.idl',
]
XPIDL_SOURCES += [
'nsIUpdateService.idl',
]

View File

@ -23,10 +23,6 @@ LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
ifeq ($(OS_ARCH),WINNT)
XPIDLSRCS += nsIWinAppHelper.idl
endif
CPPSRCS = \
nsAppRunner.cpp \
nsConsoleWriter.cpp \

View File

@ -9,3 +9,8 @@ XPIDL_SOURCES += [
'nsINativeAppSupport.idl',
]
if CONFIG['OS_ARCH'] == 'WINNT':
XPIDL_SOURCES += [
'nsIWinAppHelper.idl',
]

View File

@ -54,10 +54,6 @@ CPPSRCS = \
JSCustomObjectBuilder.cpp \
$(NULL)
XPIDLSRCS = \
nsIProfiler.idl \
$(NULL)
EXTRA_JS_MODULES = \
Profiler.jsm \
$(NULL)

View File

@ -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_ENABLE_PROFILER_SPS']:
XPIDL_SOURCES += [
'nsIProfiler.idl',
]

View File

@ -68,39 +68,6 @@ EXPORTS += \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
XPIDLSRCS += nsIPrintSettingsWin.idl \
nsIWinTaskbar.idl \
nsITaskbarPreview.idl \
nsITaskbarTabPreview.idl \
nsITaskbarWindowPreview.idl \
nsITaskbarPreviewController.idl \
nsITaskbarPreviewButton.idl \
nsITaskbarProgress.idl \
nsITaskbarOverlayIconController.idl \
nsIJumpListBuilder.idl \
nsIJumpListItem.idl \
$(NULL)
endif
ifdef MOZ_METRO
XPIDLSRCS += nsIWinMetroUtils.idl \
MetroUIUtils.idl \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
XPIDLSRCS += nsIMacDockSupport.idl \
nsIStandaloneNativeMenu.idl \
nsIMacWebAppUtils.idl \
nsITaskbarProgress.idl \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
XPIDLSRCS += nsIRwsService.idl
endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk

View File

@ -13,6 +13,31 @@ if toolkit in ('os2', 'cocoa', 'qt', 'android', 'gonk'):
if toolkit == 'windows':
DIRS += ['windows']
XPIDL_SOURCES += [
'nsIJumpListBuilder.idl',
'nsIJumpListItem.idl',
'nsIPrintSettingsWin.idl',
'nsITaskbarPreview.idl',
'nsITaskbarTabPreview.idl',
'nsITaskbarWindowPreview.idl',
'nsITaskbarPreviewController.idl',
'nsITaskbarPreviewButton.idl',
'nsITaskbarProgress.idl',
'nsITaskbarOverlayIconController.idl',
'nsIWinTaskbar.idl',
]
elif toolkit == 'cocoa':
XPIDL_SOURCES += [
'nsIMacDockSupport.idl',
'nsIMacWebAppUtils.idl',
'nsIStandaloneNativeMenu.idl',
'nsITaskbarProgress.idl',
]
elif toolkit == 'os2':
XPIDL_SOURCES += [
'nsIRwsService.idl',
]
TEST_TOOL_DIRS += ['tests']
# Don't build the DSO under the 'build' directory as windows does.
@ -55,3 +80,9 @@ XPIDL_SOURCES += [
'nsITransferable.idl',
]
if CONFIG['MOZ_METRO']:
XPIDL_SOURCES += [
'MetroUIUtils.idl',
'nsIWinMetroUtils.idl',
]

View File

@ -117,10 +117,6 @@ SDK_HEADERS += \
$(NULL)
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
XPIDLSRCS += nsIMacUtils.idl
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

View File

@ -29,3 +29,8 @@ XPIDL_SOURCES += [
'nsrootidl.idl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += [
'nsIMacUtils.idl',
]

View File

@ -92,7 +92,6 @@ EXPORTS = \
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += nsWindowsRegKey.cpp
XPIDLSRCS += nsIWindowsRegKey.idl
EXPORTS += nsWindowsRegKey.h
endif

View File

@ -30,3 +30,8 @@ XPIDL_SOURCES += [
'nsIWritablePropertyBag2.idl',
]
if CONFIG['OS_ARCH'] == 'WINNT':
XPIDL_SOURCES += [
'nsIWindowsRegKey.idl',
]

View File

@ -99,14 +99,6 @@ EXPORTS_mozilla = \
Base64.h \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
XPIDLSRCS += nsILocalFileOS2.idl
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
XPIDLSRCS += nsILocalFileMac.idl
endif # cocoa
endif # os2
SDK_HEADERS = \
nsDirectoryServiceDefs.h \
nsDirectoryServiceUtils.h \

View File

@ -37,3 +37,12 @@ XPIDL_SOURCES += [
'nsIUnicharOutputStream.idl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
XPIDL_SOURCES += [
'nsILocalFileOS2.idl',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += [
'nsILocalFileMac.idl',
]

View File

@ -37,10 +37,6 @@ CPPSRCS = \
nsSampleModule.cpp \
$(NULL)
# XPIDLSRCS specified IDL files. The build system runs the xpidl tool on these
# files to generate C++ headers and .xpt typelib files.
XPIDLSRCS = nsISample.idl
include $(topsrcdir)/config/config.mk
# EXTRA_COMPONENTS installs components written JavaScript to

View File

@ -4,3 +4,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['program']
# XPIDL_SOURCES specifies IDL files. The build system runs the xpidl tool
# on these files to generate C++ headers and .xpt typelib files.
XPIDL_SOURCES += ['nsISample.idl']

View File

@ -12,8 +12,4 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
XPIDL_MODULE = xpcom_system
ifdef MOZ_CRASHREPORTER
XPIDLSRCS += nsICrashReporter.idl
endif
include $(topsrcdir)/config/rules.mk

View File

@ -16,3 +16,8 @@ XPIDL_SOURCES += [
'nsIXULRuntime.idl',
]
if CONFIG['MOZ_CRASHREPORTER']:
XPIDL_SOURCES += [
'nsICrashReporter.idl',
]