Bug 875013 - Eliminate VPATH usage (part 1 - EXPORTS); r=joey

This commit is contained in:
Mike Shal 2013-06-26 14:51:06 -04:00
parent a303826ff9
commit 156426771a
9 changed files with 145 additions and 138 deletions

View File

@ -15,7 +15,6 @@ XPIDL_SOURCES = [
TEST_DIRS += ['test']
EXPORTS.mozilla.dom += [
'FakeSpeechRecognitionService.h',
'SpeechGrammar.h',
'SpeechGrammarList.h',
'SpeechRecognition.h',
@ -23,6 +22,7 @@ EXPORTS.mozilla.dom += [
'SpeechRecognitionResult.h',
'SpeechRecognitionResultList.h',
'SpeechStreamListener.h',
'test/FakeSpeechRecognitionService.h',
]
CPP_SOURCES += [

View File

@ -18,10 +18,10 @@ XPIDL_SOURCES += [
EXPORTS.mozilla.dom += [
'EnableSpeechSynthesisCheck.h',
'SpeechSynthesis.h',
'SpeechSynthesisChild.h',
'SpeechSynthesisParent.h',
'SpeechSynthesisUtterance.h',
'SpeechSynthesisVoice.h',
'ipc/SpeechSynthesisChild.h',
'ipc/SpeechSynthesisParent.h',
'nsSpeechTask.h',
'nsSynthVoiceRegistry.h',
]

View File

@ -62,7 +62,7 @@ if CONFIG['MOZ_B2G_BT']:
]
EXPORTS.mozilla.dom.bluetooth.ipc += [
'BluetoothMessageUtils.h',
'ipc/BluetoothMessageUtils.h',
]
EXPORTS.mozilla.dom.bluetooth += [

View File

@ -4,14 +4,21 @@
# 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_WIDGET_TOOLKIT'] == 'android':
mmsdir = 'android'
elif CONFIG['MOZ_B2G_RIL']:
mmsdir = 'ril'
else:
mmsdir = 'fallback'
EXPORTS.mozilla.dom.mobilemessage += [
'Constants.h',
'MobileMessageCallback.h',
'MobileMessageService.h',
'SmsChild.h',
'SmsParent.h',
'SmsServicesFactory.h',
'Types.h',
'ipc/SmsChild.h',
'ipc/SmsParent.h',
]
if CONFIG['MOZ_B2G_RIL']:
@ -23,8 +30,8 @@ if CONFIG['MOZ_B2G_RIL']:
]
else:
EXPORTS.mozilla.dom.mobilemessage += [
'MmsService.h',
'MobileMessageDatabaseService.h',
"%s/%s" % (mmsdir, 'MmsService.h'),
"%s/%s" % (mmsdir, 'MobileMessageDatabaseService.h'),
]
CPP_SOURCES += [
'MobileMessageDatabaseService.cpp',

View File

@ -7,40 +7,40 @@
MODULE = 'thebes'
EXPORTS += [
'BasicCanvasLayer.h',
'BasicImplData.h',
'BasicLayers.h',
'BasicLayersImpl.h',
'BasicThebesLayer.h',
'ClientCanvasLayer.h',
'ClientContainerLayer.h',
'ClientLayerManager.h',
'ClientThebesLayer.h',
'ClientTiledThebesLayer.h',
'Composer2D.h',
'CompositableHost.h',
'CompositorChild.h',
'CompositorParent.h',
'CopyableCanvasLayer.h',
'D3D9SurfaceImage.h',
'FrameMetrics.h',
'GonkIOSurfaceImage.h',
'ImageContainer.h',
'ImageHost.h',
'ImageLayerOGL.h',
'ImageLayers.h',
'ImageTypes.h',
'LayerManagerOGL.h',
'LayerManagerOGLProgram.h',
'LayerManagerOGLShaders.h',
'LayerSorter.h',
'LayerTreeInvalidation.h',
'Layers.h',
'LayersLogging.h',
'ReadbackLayer.h',
'ShadowLayersManager.h',
'SharedTextureImage.h',
'TexturePoolOGL.h',
'basic/BasicCanvasLayer.h',
'basic/BasicImplData.h',
'basic/BasicLayers.h',
'basic/BasicLayersImpl.h',
'basic/BasicThebesLayer.h',
'client/ClientCanvasLayer.h',
'client/ClientContainerLayer.h',
'client/ClientLayerManager.h',
'client/ClientThebesLayer.h',
'client/ClientTiledThebesLayer.h',
'composite/CompositableHost.h',
'composite/ImageHost.h',
'ipc/CompositorChild.h',
'ipc/CompositorParent.h',
'ipc/ShadowLayersManager.h',
'opengl/Composer2D.h',
'opengl/ImageLayerOGL.h',
'opengl/LayerManagerOGL.h',
'opengl/LayerManagerOGLProgram.h',
'opengl/LayerManagerOGLShaders.h',
'opengl/TexturePoolOGL.h',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
@ -49,8 +49,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
]
if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
EXPORTS += [
'DeviceManagerD3D9.h',
'LayerManagerD3D9.h',
'd3d9/DeviceManagerD3D9.h',
'd3d9/LayerManagerD3D9.h',
]
CPP_SOURCES += [
'LayerManagerD3D9.cpp',
@ -64,13 +64,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
]
if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
EXPORTS += [
'LayerManagerD3D10.h',
'ReadbackManagerD3D10.h',
'd3d10/LayerManagerD3D10.h',
'd3d10/ReadbackManagerD3D10.h',
]
EXPORTS.mozilla.layers += [
'CompositorD3D11.h',
'ShadowLayerUtilsD3D10.h',
'TextureD3D11.h',
'd3d11/CompositorD3D11.h',
'd3d11/TextureD3D11.h',
'ipc/ShadowLayerUtilsD3D10.h',
]
CPP_SOURCES += [
'CanvasLayerD3D10.cpp',
@ -86,62 +86,62 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
]
EXPORTS.gfxipc += [
'ShadowLayerUtils.h',
'ipc/ShadowLayerUtils.h',
]
EXPORTS.mozilla.layers += [
'AsyncCompositionManager.h',
'AsyncPanZoomController.h',
'Axis.h',
'BasicCompositor.h',
'CanvasClient.h',
'CanvasLayerComposite.h',
'ColorLayerComposite.h',
'CompositableClient.h',
'CompositableForwarder.h',
'CompositableTransactionParent.h',
'CompositingRenderTargetOGL.h',
'Compositor.h',
'CompositorChild.h',
'CompositorCocoaWidgetHelper.h',
'CompositorOGL.h',
'CompositorParent.h',
'CompositorTypes.h',
'ContainerLayerComposite.h',
'ContentClient.h',
'ContentHost.h',
'D3D9SurfaceImage.h',
'Effects.h',
'GeckoContentController.h',
'GestureEventListener.h',
'ISurfaceAllocator.h',
'ImageBridgeChild.h',
'ImageBridgeParent.h',
'ImageClient.h',
'ImageHost.h',
'ImageLayerComposite.h',
'LayerManagerComposite.h',
'LayerTransactionChild.h',
'LayerTransactionParent.h',
'LayersTypes.h',
'RenderTrace.h',
'ShadowLayers.h',
'ShadowLayersManager.h',
'SharedPlanarYCbCrImage.h',
'SharedRGBImage.h',
'TaskThrottler.h',
'TextureClient.h',
'TextureClientOGL.h',
'TextureHost.h',
'TextureHostOGL.h',
'ThebesLayerComposite.h',
'TiledContentClient.h',
'YCbCrImageDataSerializer.h',
'basic/BasicCompositor.h',
'client/CanvasClient.h',
'client/CompositableClient.h',
'client/ContentClient.h',
'client/ImageClient.h',
'client/TextureClient.h',
'client/TiledContentClient.h',
'composite/AsyncCompositionManager.h',
'composite/CanvasLayerComposite.h',
'composite/ColorLayerComposite.h',
'composite/ContainerLayerComposite.h',
'composite/ContentHost.h',
'composite/ImageHost.h',
'composite/ImageLayerComposite.h',
'composite/LayerManagerComposite.h',
'composite/TextureHost.h',
'composite/ThebesLayerComposite.h',
'ipc/AsyncPanZoomController.h',
'ipc/Axis.h',
'ipc/CompositableForwarder.h',
'ipc/CompositableTransactionParent.h',
'ipc/CompositorChild.h',
'ipc/CompositorCocoaWidgetHelper.h',
'ipc/CompositorParent.h',
'ipc/GeckoContentController.h',
'ipc/GestureEventListener.h',
'ipc/ISurfaceAllocator.h',
'ipc/ImageBridgeChild.h',
'ipc/ImageBridgeParent.h',
'ipc/LayerTransactionChild.h',
'ipc/LayerTransactionParent.h',
'ipc/ShadowLayers.h',
'ipc/ShadowLayersManager.h',
'ipc/SharedPlanarYCbCrImage.h',
'ipc/SharedRGBImage.h',
'ipc/TaskThrottler.h',
'opengl/CompositingRenderTargetOGL.h',
'opengl/CompositorOGL.h',
'opengl/TextureClientOGL.h',
'opengl/TextureHostOGL.h',
]
if CONFIG['MOZ_X11']:
EXPORTS.mozilla.layers += [
'ShadowLayerUtilsX11.h'
'ipc/ShadowLayerUtilsX11.h',
]
CPP_SOURCES += [
'ShadowLayerUtilsX11.cpp'
@ -149,7 +149,7 @@ if CONFIG['MOZ_X11']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
EXPORTS.mozilla.layers += [
'GLManager.h'
'opengl/GLManager.h',
]
CPP_SOURCES += [
'ShadowLayerUtilsMac.cpp',
@ -161,7 +161,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
# has full system permissions there.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
EXPORTS.mozilla.layers += [
'ShadowLayerUtilsGralloc.h'
'ipc/ShadowLayerUtilsGralloc.h',
]
CPP_SOURCES += [
'ShadowLayerUtilsGralloc.cpp',

View File

@ -40,7 +40,6 @@ EXPORTS += [
'jsdbgapi.h',
'jsfriendapi.h',
'jslock.h',
'jsperf.h',
'jsprf.h',
'jsprototypes.h',
'jsproxy.h',
@ -50,6 +49,7 @@ EXPORTS += [
'jsutil.h',
'jsversion.h',
'jswrapper.h',
'perf/jsperf.h',
]
if CONFIG['HAVE_DTRACE']:
@ -61,22 +61,22 @@ if CONFIG['HAVE_DTRACE']:
# that we ensure we don't over-expose our internal integer typedefs. Note that
# LegacyIntTypes.h below is deliberately exempted from this requirement.
EXPORTS.js += [
'Anchor.h',
'CallArgs.h',
'CharacterEncoding.h',
'Date.h',
'GCAPI.h',
'HashTable.h',
'HeapAPI.h',
'LegacyIntTypes.h',
'MemoryMetrics.h',
'PropertyKey.h',
'RequiredDefines.h',
'RootingAPI.h',
'TemplateLib.h',
'Utility.h',
'Value.h',
'Vector.h',
'../public/Anchor.h',
'../public/CallArgs.h',
'../public/CharacterEncoding.h',
'../public/Date.h',
'../public/GCAPI.h',
'../public/HashTable.h',
'../public/HeapAPI.h',
'../public/LegacyIntTypes.h',
'../public/MemoryMetrics.h',
'../public/PropertyKey.h',
'../public/RequiredDefines.h',
'../public/RootingAPI.h',
'../public/TemplateLib.h',
'../public/Utility.h',
'../public/Value.h',
'../public/Vector.h',
]
CPP_SOURCES += [

View File

@ -7,28 +7,28 @@
MODULE = 'vpx'
EXPORTS.vpx += [
'arm.h',
'mem.h',
'scale_mode.h',
'vp8.h',
'vp8cx.h',
'vp8dx.h',
'vp8e.h',
'vpx_codec.h',
'vpx_codec_impl_bottom.h',
'vpx_codec_impl_top.h',
'vpx_decoder.h',
'vpx_decoder_compat.h',
'vpx_encoder.h',
'vpx_image.h',
'vpx_integer.h',
'vpx_mem.h',
'vpx_mem_intrnl.h',
'vpx_timer.h',
'vpxscale.h',
'x86.h',
'yv12config.h',
'yv12extend.h',
'vpx/vp8.h',
'vpx/vp8cx.h',
'vpx/vp8dx.h',
'vpx/vp8e.h',
'vpx/vpx_codec.h',
'vpx/vpx_codec_impl_bottom.h',
'vpx/vpx_codec_impl_top.h',
'vpx/vpx_decoder.h',
'vpx/vpx_decoder_compat.h',
'vpx/vpx_encoder.h',
'vpx/vpx_image.h',
'vpx/vpx_integer.h',
'vpx_mem/include/vpx_mem_intrnl.h',
'vpx_mem/vpx_mem.h',
'vpx_ports/arm.h',
'vpx_ports/mem.h',
'vpx_ports/vpx_timer.h',
'vpx_ports/x86.h',
'vpx_scale/scale_mode.h',
'vpx_scale/vpxscale.h',
'vpx_scale/yv12config.h',
'vpx_scale/yv12extend.h',
]
if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:

View File

@ -5,9 +5,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.snappy += [
'snappy-c.h',
'snappy-stubs-public.h',
'snappy.h',
'src/snappy-c.h',
'src/snappy.h',
]
CPP_SOURCES += [

View File

@ -7,29 +7,29 @@
MODULE = 'protobuf'
EXPORTS.protobuf.google.protobuf += [
'extension_set.h',
'generated_message_util.h',
'message_lite.h',
'repeated_field.h',
'wire_format_lite.h',
'wire_format_lite_inl.h',
'google/protobuf/extension_set.h',
'google/protobuf/generated_message_util.h',
'google/protobuf/message_lite.h',
'google/protobuf/repeated_field.h',
'google/protobuf/wire_format_lite.h',
'google/protobuf/wire_format_lite_inl.h',
]
EXPORTS.protobuf.google.protobuf.stubs += [
'common.h',
'hash.h',
'map-util.h',
'once.h',
'stl_util-inl.h',
'google/protobuf/stubs/common.h',
'google/protobuf/stubs/hash.h',
'google/protobuf/stubs/map-util.h',
'google/protobuf/stubs/once.h',
'google/protobuf/stubs/stl_util-inl.h',
]
EXPORTS.protobuf.google.protobuf.io += [
'coded_stream.h',
'coded_stream_inl.h',
'package_info.h',
'zero_copy_stream.h',
'zero_copy_stream_impl.h',
'zero_copy_stream_impl_lite.h',
'google/protobuf/io/coded_stream.h',
'google/protobuf/io/coded_stream_inl.h',
'google/protobuf/io/zero_copy_stream.h',
'google/protobuf/io/zero_copy_stream_impl.h',
'google/protobuf/io/zero_copy_stream_impl_lite.h',
'google/protobuf/package_info.h',
]
CPP_SOURCES += [