bug 870407: move CMMSRCS to moz.build (file batch #1). r=mshal

toolkit/components/startup/Makefile.in

@@ -15,7 +15,7 @@ FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += nsUserInfoMac.mm
+DISABLE_CMMSRCS += nsUserInfoMac.mm
 endif
 
 include $(topsrcdir)/config/rules.mk

toolkit/components/startup/moz.build

@@ -30,8 +30,9 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         'nsUserInfoWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    # TODO: CMMSRCS go here
-    pass
+    CMMSRCS += [
+        'nsUserInfoMac.mm',
+    ]
 else:
     CPP_SOURCES += [
         'nsUserInfoUnix.cpp',

toolkit/crashreporter/Makefile.in

@@ -14,7 +14,7 @@ LIBRARY_NAME = exception_handler_s
 MSVC_ENABLE_PGO := 1
 
 ifeq ($(OS_ARCH),Darwin)
-CMMSRCS = mac_utils.mm
+DISABLED_CMMSRCS = mac_utils.mm
 endif
 
 ifeq ($(OS_ARCH),Linux)

toolkit/crashreporter/client/Makefile.in

@@ -39,7 +39,7 @@ MOZ_WINCONSOLE = 0
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-CMMSRCS += crashreporter_osx.mm
+DISABLED_CMMSRCS += crashreporter_osx.mm
 OS_LIBS += -framework Cocoa
 LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \

toolkit/crashreporter/client/moz.build

@@ -43,3 +43,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
         CPP_SOURCES += [
             'crashreporter_linux.cpp',
         ]
+
+if CONFIG['OS_ARCH'] == 'Darwin':
+    CMMSRCS += [
+        'crashreporter_osx.mm',
+    ]

toolkit/crashreporter/google-breakpad/src/common/Makefile.in

@@ -39,7 +39,7 @@ endif
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-CMMSRCS += \
+DISABLED_CMMSRCS += \
   mac/dump_syms.mm
 endif
 

toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in

@@ -21,7 +21,7 @@ CMSRCS = \
   HTTPMultipartUpload.m \
   $(NULL)
 
-CMMSRCS = \
+DISABLED_CMMSRCS = \
   MachIPC.mm \
   $(NULL)
 

toolkit/crashreporter/google-breakpad/src/common/mac/moz.build

@@ -17,3 +17,6 @@ CPP_SOURCES += [
     'string_utilities.cc',
 ]
 
+CMMSRCS += [
+    'MachIPC.mm',
+]

toolkit/crashreporter/google-breakpad/src/common/moz.build

@@ -47,3 +47,8 @@ else:
             'stabs_to_module.cc',
             'stabs_reader.cc',
         ]
+
+if CONFIG['OS_ARCH'] == 'Darwin':
+    CMMSRCS += [
+        'mac/dump_syms.mm',
+    ]

toolkit/crashreporter/moz.build

@@ -67,3 +67,8 @@ CPP_SOURCES += [
     'nsExceptionHandler.cpp',
 ]
 
+
+if CONFIG['OS_ARCH'] == 'Darwin':
+    CMMSRCS += [
+        'mac_utils.mm',
+    ]

toolkit/mozapps/update/updater/Makefile.in

@@ -44,7 +44,7 @@ OS_LIBS += $(TK_LIBS)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += progressui_osx.mm launchchild_osx.mm
+DISABLED_CMMSRCS += progressui_osx.mm launchchild_osx.mm
 OS_LIBS += -framework Cocoa
 endif
 

toolkit/mozapps/update/updater/moz.build

@@ -40,3 +40,9 @@ if have_progressui == 0:
     CPP_SOURCES += [
         'progressui_null.cpp',
     ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'launchchild_osx.mm',
+        'progressui_osx.mm',
+    ]

toolkit/system/osxproxy/Makefile.in

@@ -16,7 +16,7 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsOSXProxyModule
 LIBXUL_LIBRARY  = 1
 
-CMMSRCS = \
+DISABLED_CMMSRCS = \
         nsOSXSystemProxySettings.mm \
         $(NULL)
 

toolkit/system/osxproxy/moz.build

@@ -6,3 +6,6 @@
 
 MODULE = 'osxproxy'
 
+CMMSRCS += [
+    'nsOSXSystemProxySettings.mm',
+]

xpcom/io/Makefile.in

@@ -23,7 +23,7 @@ endif
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS		+= \
+DISABLED_CMMSRCS		+= \
 		CocoaFileUtils.mm \
 		$(NULL)
 endif

xpcom/io/moz.build

@@ -115,3 +115,8 @@ CPP_SOURCES += [
     'nsWildCard.cpp',
 ]
 
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'CocoaFileUtils.mm',
+    ]