Backout e6bda3437a7c for OSX bustage.
authorWes Kocher <wkocher@mozilla.com>
Fri, 12 Jul 2013 15:08:33 -0700
changeset 138767 417682db13bdac13cffb8676650c555d8fceb7b3
parent 138766 92fa0b21fbb8f977f1d4e6f35cb706a80557e451
child 138768 33fb417caccf3fb5b2676d9d119f2f9e9ab71447
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
milestone25.0a1
backs oute6bda3437a7cc59002e3bcddab79a91196485fe7
Backout e6bda3437a7c for OSX bustage.
toolkit/xre/Makefile.in
toolkit/xre/moz.build
tools/profiler/Makefile.in
tools/profiler/moz.build
uriloader/exthandler/Makefile.in
uriloader/exthandler/moz.build
webapprt/mac/Makefile.in
webapprt/mac/moz.build
widget/cocoa/Makefile.in
widget/cocoa/moz.build
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -32,19 +32,26 @@ DEFINES += \
 ifdef MOZ_UPDATER
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_UPDATER
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS = nsNativeAppSupportCocoa.mm
+endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS += MacLaunchHelper.mm
+CMMSRCS += MacApplicationDelegate.mm
+CMMSRCS += MacAutoreleasePool.mm
 ENABLE_CXX_EXCEPTIONS = 1
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"'
 endif
 
 SHARED_LIBRARY_LIBS += \
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -82,16 +82,8 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
         'EventTracer.cpp',
     ]
 
 if CONFIG['MOZ_UPDATER']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         CPP_SOURCES += [
             'nsUpdateDriver.cpp',
         ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
-        'MacApplicationDelegate.mm',
-        'MacAutoreleasePool.mm',
-        'MacLaunchHelper.mm',
-        'nsNativeAppSupportCocoa.mm',
-    ]
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -27,11 +27,16 @@ EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 # Uncomment for better debugging in opt builds
 #MOZ_OPTIMIZE_FLAGS += -O0 -g
 
-endif # MOZ_ENABLE_PROFILER_SPS
+ifeq ($(OS_TARGET),Darwin)
+CMMSRCS += \
+  shim_mac_dump_syms.mm
+endif
+
+endif
 
 include $(topsrcdir)/config/rules.mk
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -59,13 +59,8 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla += [
     'IOInterposer.h',
     'SQLiteInterposer.h',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
-
-if CONFIG['MOZ_ENABLE_PROFILER_SPS'] and CONFIG['OS_TARGET'] == 'Darwin':
-    CMMSRCS += [
-        'shim_mac_dump_syms.mm',
-    ]
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -32,16 +32,25 @@ endif
 endif
 
 VPATH		:= $(srcdir) $(srcdir)/$(OSDIR)
 
 LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+
+CMMSRCS	= nsOSHelperAppService.mm \
+			nsMIMEInfoMac.mm \
+			nsLocalHandlerAppMac.mm \
+			$(NULL)
+endif
+
 LOCAL_INCLUDES = -I$(srcdir)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
             -I$(topsrcdir)/dom/ipc \
             -I$(topsrcdir)/content/base/src \
             -I$(topsrcdir)/content/events/src \
             -I$(topsrcdir)/netwerk/base/src \
             -I$(topsrcdir)/netwerk/protocol/http
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -59,21 +59,18 @@ CPP_SOURCES += [
     'ExternalHelperAppParent.cpp',
     'nsExternalHelperAppService.cpp',
     'nsExternalProtocolHandler.cpp',
     'nsLocalHandlerApp.cpp',
     'nsMIMEInfoImpl.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS = [
-        'nsLocalHandlerAppMac.mm',
-        'nsMIMEInfoMac.mm',
-        'nsOSHelperAppService.mm',
-    ]
+    # TODO: CMMSRCS go here
+    pass
 else:
     CPP_SOURCES += [
         'nsOSHelperAppService.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     CPP_SOURCES += [
         'nsGNOMERegistry.cpp',
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -8,16 +8,18 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
+CMMSRCS = webapprt.mm
+
 # Don't create a dependency on mozglue, which is impossible (difficult?)
 # to dynamically link into our executable, as we copy it to arbitrary locations.
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
--- a/webapprt/mac/moz.build
+++ b/webapprt/mac/moz.build
@@ -1,11 +1,8 @@
 # -*- 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/.
 
 PROGRAM = 'webapprt-stub'
 
-CMMSRCS += [
-    'webapprt.mm',
-]
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -8,16 +8,62 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY = 1
 
+
+
+CMMSRCS = \
+  nsBidiKeyboard.mm \
+  nsClipboard.mm \
+  nsMenuX.mm \
+  nsMenuBarX.mm \
+  nsMenuItemX.mm \
+  nsMenuItemIconX.mm \
+  nsMenuUtilsX.mm \
+  nsMenuGroupOwnerX.mm \
+  nsFilePicker.mm \
+  nsDragService.mm \
+  nsToolkit.mm \
+  nsAppShell.mm \
+  nsCocoaFeatures.mm \
+  nsCocoaUtils.mm \
+  nsCocoaWindow.mm \
+  nsChildView.mm \
+  nsWindowMap.mm \
+  nsWidgetFactory.mm \
+  nsCursorManager.mm \
+  nsMacCursor.mm \
+  nsScreenCocoa.mm \
+  nsScreenManagerCocoa.mm \
+  nsSound.mm \
+  nsLookAndFeel.mm \
+  nsNativeThemeCocoa.mm \
+  nsDeviceContextSpecX.mm \
+  nsPrintDialogX.mm \
+  nsPrintOptionsX.mm \
+  nsPrintSettingsX.mm \
+  nsIdleServiceX.mm \
+  TextInputHandler.mm \
+  nsMacDockSupport.mm \
+  nsStandaloneNativeMenu.mm \
+  nsMacWebAppUtils.mm \
+  GfxInfo.mm \
+  WidgetTraceEvent.mm \
+  NativeKeyBindings.mm \
+  $(NULL)
+
+ifeq (x86_64,$(TARGET_CPU))
+CMMSRCS += ComplexTextInputPanel.mm
+endif
+
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 
 NIB_FILES = \
 	classes.nib \
 	info.nib \
 	keyedobjects.nib \
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -16,51 +16,8 @@ EXPORTS += [
     'mozView.h',
     'nsChangeObserver.h',
     'nsCocoaFeatures.h',
     'nsCocoaUtils.h',
 ]
 
 LIBRARY_NAME = 'widget_mac'
 
-CMMSRCS += [
-    'GfxInfo.mm',
-    'TextInputHandler.mm',
-    'WidgetTraceEvent.mm',
-    'nsAppShell.mm',
-    'nsBidiKeyboard.mm',
-    'nsChildView.mm',
-    'nsClipboard.mm',
-    'nsCocoaFeatures.mm',
-    'nsCocoaUtils.mm',
-    'nsCocoaWindow.mm',
-    'nsCursorManager.mm',
-    'nsDeviceContextSpecX.mm',
-    'nsDragService.mm',
-    'nsFilePicker.mm',
-    'nsIdleServiceX.mm',
-    'nsLookAndFeel.mm',
-    'nsMacCursor.mm',
-    'nsMacDockSupport.mm',
-    'nsMacWebAppUtils.mm',
-    'nsMenuBarX.mm',
-    'nsMenuGroupOwnerX.mm',
-    'nsMenuItemIconX.mm',
-    'nsMenuItemX.mm',
-    'nsMenuUtilsX.mm',
-    'nsMenuX.mm',
-    'nsNativeThemeCocoa.mm',
-    'nsPrintDialogX.mm',
-    'nsPrintOptionsX.mm',
-    'nsPrintSettingsX.mm',
-    'nsScreenCocoa.mm',
-    'nsScreenManagerCocoa.mm',
-    'nsSound.mm',
-    'nsStandaloneNativeMenu.mm',
-    'nsToolkit.mm',
-    'nsWidgetFactory.mm',
-    'nsWindowMap.mm',
-]
-
-if CONFIG['TARGET_CPU'] == 'x86_64':
-    CMMSRCS += [
-        'ComplexTextInputPanel.mm',
-    ]