bug 870407: move CMMSRCS to mozbuild (file batch #2) r=mshal
authorJoey Armstrong <joey@mozilla.com>
Mon, 01 Jul 2013 12:32:40 -0400
changeset 137035 932964100cd2f802c369d335804a762cfad1d2a3
parent 137034 b4b9098538cb90ffe9b598db3417add72281d63e
child 137036 a36049f735575a5ca46f0387546f10ca7a70a650
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs870407
milestone25.0a1
bug 870407: move CMMSRCS to mozbuild (file batch #2) r=mshal
accessible/src/mac/Makefile.in
accessible/src/mac/moz.build
dom/plugins/ipc/Makefile.in
dom/plugins/ipc/interpose/Makefile.in
dom/plugins/ipc/interpose/moz.build
dom/plugins/ipc/moz.build
embedding/components/printingui/src/mac/Makefile.in
embedding/components/printingui/src/mac/moz.build
gfx/2d/Makefile.in
gfx/2d/moz.build
gfx/gl/Makefile.in
gfx/gl/moz.build
gfx/thebes/Makefile.in
gfx/thebes/moz.build
hal/Makefile.in
hal/moz.build
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -7,17 +7,17 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-CMMSRCS = \
+DISABLED_CMMSRCS = \
           AccessibleWrap.mm \
           DocAccessibleWrap.mm \
           mozAccessible.mm \
           mozDocAccessible.mm \
           mozActionElements.mm \
           mozTextAccessible.mm \
           mozHTMLAccessible.mm \
           MacUtils.mm \
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -12,8 +12,20 @@ EXPORTS += [
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
+CMMSRCS += [
+    'AccessibleWrap.mm',
+    'DocAccessibleWrap.mm',
+    'MacUtils.mm',
+    'Platform.mm',
+    'RootAccessibleWrap.mm',
+    'mozAccessible.mm',
+    'mozActionElements.mm',
+    'mozDocAccessible.mm',
+    'mozHTMLAccessible.mm',
+    'mozTextAccessible.mm',
+]
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -18,17 +18,17 @@ EXPORT_LIBRARY = 1
 
 ifeq (WINNT,$(OS_ARCH))
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS   += \
+DISABLED_CMMSRCS   += \
     PluginUtilsOSX.mm \
     PluginInterposeOSX.mm \
     $(NULL)
 endif
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(topsrcdir)/xpcom/base/ \
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@@ -7,15 +7,15 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_SHARED_LIB = 1
 DIST_INSTALL     = 1
 
-CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
+DISABLED_CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
 
 EXTRA_DSO_LDOPTS += \
   -framework Carbon \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -1,8 +1,12 @@
 # -*- 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/.
 
 LIBRARY_NAME = 'plugin_child_interpose'
 
+CMMSRCS += [
+    "%s.mm" % (LIBRARY_NAME),
+    'plugin_child_quirks.mm',
+]
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -80,8 +80,14 @@ CPP_SOURCES += [
     'PluginProcessChild.cpp',
     'PluginProcessParent.cpp',
     'PluginScriptableObjectChild.cpp',
     'PluginScriptableObjectParent.cpp',
     'PluginStreamChild.cpp',
     'PluginStreamParent.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'PluginInterposeOSX.mm',
+        'PluginUtilsOSX.mm',
+    ]
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -10,17 +10,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
 
 
-CMMSRCS = nsPrintingPromptServiceX.mm
+DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm
 
 LOCAL_INCLUDES	= \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -8,8 +8,11 @@ MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
+CMMSRCS += [
+    'nsPrintingPromptServiceX.mm',
+]
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -11,17 +11,17 @@ VPATH		=  $(srcdir) $(srcdir)/unittest
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gfx2d
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS = \
+DISABLED_CMMSRCS = \
 	   QuartzSupport.mm \
 	   $(NULL)
 endif
 
 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
 DEFINES += -DMOZ_ENABLE_FREETYPE
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -90,8 +90,13 @@ CPP_SOURCES += [
     'PathRecording.cpp',
     'RecordedEvent.cpp',
     'Scale.cpp',
     'ScaledFontBase.cpp',
     'SourceSurfaceCairo.cpp',
     'SourceSurfaceRawData.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'QuartzSupport.mm',
+    ]
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -65,17 +65,17 @@ LOCAL_INCLUDES = -I$(topsrcdir)/widget/g
 endif
 
 ifdef MOZ_GL_PROVIDER
 GL_PROVIDER = $(MOZ_GL_PROVIDER)
 endif
 
 # Mac is a special snowflake
 ifeq ($(GL_PROVIDER),CGL)
-CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
+DISABLED_CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
 endif
 
 ifdef MOZ_ANDROID_OMTC
 DEFINES += -DMOZ_ANDROID_OMTC
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -75,18 +75,19 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'GLContextSkia.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     CPP_SOURCES += ['SharedSurfaceGralloc.cpp']
     EXPORTS += ['SharedSurfaceGralloc.h']
 
 if gl_provider == 'CGL':
-    # TODO: CMMSRCS
-    pass
+    CMMSRCS += [
+        "GLContextProvider%s.mm" % (gl_provider),
+    ]
 else:
     CPP_SOURCES += [
         'GLContextProvider%s.cpp' % gl_provider,
     ]
 
 if gl_provider == 'EGL':
     CPP_SOURCES += [
         'GLLibraryEGL.cpp',
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -51,17 +51,17 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 # top of the android java runtime.
 DEFINES +=	-DMOZ_USING_ANDROID_JAVA_WIDGETS
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS = \
+DISABLED_CMMSRCS = \
 	gfxMacPlatformFontList.mm \
 	$(NULL)
 endif
 
 DEFINES += \
 	-DIMPL_THEBES \
 	-DHB_DONT_DEFINE_STDINT \
 	-DMOZ_OTS_REPORT_ERRORS \
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -255,8 +255,13 @@ CPP_SOURCES += [
     'gfxScriptItemizer.cpp',
     'gfxSkipChars.cpp',
     'gfxTeeSurface.cpp',
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsSurfaceTexture.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'gfxMacPlatformFontList.mm',
+    ]
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -27,17 +27,17 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += \
+DISABLED_CMMSRCS += \
   CocoaSensor.mm \
   smslib.mm \
   $(NULL)
 endif
 
 ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -134,8 +134,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk
         'FallbackDiskSpaceWatcher.cpp',
     ]
 
 # Fallbacks for backends implemented on Android only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     CPP_SOURCES += [
         'FallbackNetwork.cpp'
     ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'CocoaSensor.mm',
+        'smslib.mm',
+    ]