From cc66e068342efb7f6576aa67503803d769cd95ac Mon Sep 17 00:00:00 2001 From: Joey Armstrong Date: Fri, 7 Jun 2013 11:43:39 -0400 Subject: [PATCH] bug 870407: move CMMSRCS to moz.build (file batch #1). r=mshal --- toolkit/components/startup/Makefile.in | 2 +- toolkit/components/startup/moz.build | 5 +++-- toolkit/crashreporter/Makefile.in | 2 +- toolkit/crashreporter/client/Makefile.in | 2 +- toolkit/crashreporter/client/moz.build | 5 +++++ .../crashreporter/google-breakpad/src/common/Makefile.in | 2 +- .../google-breakpad/src/common/mac/Makefile.in | 2 +- .../crashreporter/google-breakpad/src/common/mac/moz.build | 3 +++ toolkit/crashreporter/google-breakpad/src/common/moz.build | 5 +++++ toolkit/crashreporter/moz.build | 5 +++++ toolkit/mozapps/update/updater/Makefile.in | 2 +- toolkit/mozapps/update/updater/moz.build | 6 ++++++ toolkit/system/osxproxy/Makefile.in | 2 +- toolkit/system/osxproxy/moz.build | 3 +++ xpcom/io/Makefile.in | 2 +- xpcom/io/moz.build | 5 +++++ 16 files changed, 43 insertions(+), 10 deletions(-) diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in index 00f60059c51a..8b2ed1e1dec8 100644 --- a/toolkit/components/startup/Makefile.in +++ b/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 diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index 08ec6291c39d..a1cf85e9beb3 100644 --- a/toolkit/components/startup/moz.build +++ b/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', diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 2cc40c0cbdb0..cf7d186aec1f 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/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) diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index d14ea9bdf428..802c0b6bcb83 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/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) \ diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build index bf8c1847fc48..5c6ab1ca17e4 100644 --- a/toolkit/crashreporter/client/moz.build +++ b/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', + ] diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index 554b64ae0f43..fd5e243836ec 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/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 diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index 36ca91d47227..f492a11474ee 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -21,7 +21,7 @@ CMSRCS = \ HTTPMultipartUpload.m \ $(NULL) -CMMSRCS = \ +DISABLED_CMMSRCS = \ MachIPC.mm \ $(NULL) diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build index 8b228eec60b9..5ed8984f1fd3 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -17,3 +17,6 @@ CPP_SOURCES += [ 'string_utilities.cc', ] +CMMSRCS += [ + 'MachIPC.mm', +] diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index dbd624df3993..2312556185c2 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/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', + ] diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index a712a39c3a37..7251f577040e 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -67,3 +67,8 @@ CPP_SOURCES += [ 'nsExceptionHandler.cpp', ] + +if CONFIG['OS_ARCH'] == 'Darwin': + CMMSRCS += [ + 'mac_utils.mm', + ] diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 7c9b766340da..406b0d697563 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/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 diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index 52e97e41494d..eb6f72d45881 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/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', + ] diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in index 33803a3954b5..626412d87be6 100644 --- a/toolkit/system/osxproxy/Makefile.in +++ b/toolkit/system/osxproxy/Makefile.in @@ -16,7 +16,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsOSXProxyModule LIBXUL_LIBRARY = 1 -CMMSRCS = \ +DISABLED_CMMSRCS = \ nsOSXSystemProxySettings.mm \ $(NULL) diff --git a/toolkit/system/osxproxy/moz.build b/toolkit/system/osxproxy/moz.build index 995d7733c9d8..07b47b9e04ce 100644 --- a/toolkit/system/osxproxy/moz.build +++ b/toolkit/system/osxproxy/moz.build @@ -6,3 +6,6 @@ MODULE = 'osxproxy' +CMMSRCS += [ + 'nsOSXSystemProxySettings.mm', +] diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index f8fc45e887e1..e9a965bddcdd 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -23,7 +23,7 @@ endif endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CMMSRCS += \ +DISABLED_CMMSRCS += \ CocoaFileUtils.mm \ $(NULL) endif diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 3cb5e2ba78dc..b17bca770e5f 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -115,3 +115,8 @@ CPP_SOURCES += [ 'nsWildCard.cpp', ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CMMSRCS += [ + 'CocoaFileUtils.mm', + ]