bug 870407: move CMMSRCS to mozbuild (file batch #2) r=mshal

dothq · Jul 1, 2013 · 03706f3 · 03706f3
1 parent 703184d
commit 03706f3
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 10 deletions.
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
@@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-CMMSRCS = \
+DISABLED_CMMSRCS = \
           AccessibleWrap.mm \
           DocAccessibleWrap.mm \
           mozAccessible.mm \

diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
@@ -17,3 +17,15 @@ EXPORTS.mozilla.a11y += [
 
 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',
+]
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
@@ -23,7 +23,7 @@ DEFINES += \
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS   += \
+DISABLED_CMMSRCS   += \
     PluginUtilsOSX.mm \
     PluginInterposeOSX.mm \
     $(NULL)

diff --git a/dom/plugins/ipc/interpose/Makefile.in b/dom/plugins/ipc/interpose/Makefile.in
@@ -12,7 +12,7 @@ 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 \

diff --git a/dom/plugins/ipc/interpose/moz.build b/dom/plugins/ipc/interpose/moz.build
@@ -6,3 +6,7 @@
 
 LIBRARY_NAME = 'plugin_child_interpose'
 
+CMMSRCS += [
+    "%s.mm" % (LIBRARY_NAME),
+    'plugin_child_quirks.mm',
+]
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
@@ -85,3 +85,9 @@ CPP_SOURCES += [
     'PluginStreamParent.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'PluginInterposeOSX.mm',
+        'PluginUtilsOSX.mm',
+    ]
diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in
@@ -15,7 +15,7 @@ LIBXUL_LIBRARY	= 1
 
 
 
-CMMSRCS = nsPrintingPromptServiceX.mm
+DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm
 
 LOCAL_INCLUDES	= \
 		$(NULL)

diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build
@@ -13,3 +13,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'printingui_s'
 
+CMMSRCS += [
+    'nsPrintingPromptServiceX.mm',
+]
diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in
@@ -16,7 +16,7 @@ LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS = \
+DISABLED_CMMSRCS = \
 	   QuartzSupport.mm \
 	   $(NULL)
 endif

diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
@@ -95,3 +95,8 @@ CPP_SOURCES += [
     'SourceSurfaceRawData.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'QuartzSupport.mm',
+    ]
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
@@ -70,7 +70,7 @@ 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

diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
@@ -80,8 +80,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += ['SharedSurfaceGralloc.h']
 
 if gl_provider == 'CGL':
-    # TODO: CMMSRCS
-    pass
+    CMMSRCS += [
+        "GLContextProvider%s.mm" % (gl_provider),
+    ]
 else:
     CPP_SOURCES += [
         'GLContextProvider%s.cpp' % gl_provider,

diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
@@ -56,7 +56,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS = \
+DISABLED_CMMSRCS = \
 	gfxMacPlatformFontList.mm \
 	$(NULL)
 endif

diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
@@ -260,3 +260,8 @@ CPP_SOURCES += [
     'nsSurfaceTexture.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'gfxMacPlatformFontList.mm',
+    ]
diff --git a/hal/Makefile.in b/hal/Makefile.in
@@ -32,7 +32,7 @@ MOCHITEST_BROWSER_FILES += \
 	$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += \
+DISABLED_CMMSRCS += \
   CocoaSensor.mm \
   smslib.mm \
   $(NULL)

diff --git a/hal/moz.build b/hal/moz.build
@@ -139,3 +139,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     CPP_SOURCES += [
         'FallbackNetwork.cpp'
     ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'CocoaSensor.mm',
+        'smslib.mm',
+    ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ LIBXUL_LIBRARY = 1 @@
-    CMMSRCS = nsPrintingPromptServiceX.mm
+    DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm
     LOCAL_INCLUDES	= \
     		$(NULL)
@@ Expand Down @@