From af1ae32d898f0940f4141d2fde1ef6fb820d9833 Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 14 Dec 2009 06:55:31 -0500 Subject: [PATCH] bug 514188 - sync to breakpad revision 463 to pick up Linux client rewrite (Mozilla changes). r=bsmedberg --HG-- rename : toolkit/crashreporter/google-breakpad/src/common/mac/dwarf/Makefile.in => toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in extra : rebase_source : 64c09b14945060aac4fa3a02a4281148e99d5097 --- toolkit/crashreporter/Makefile.in | 1 + toolkit/crashreporter/client/Makefile.in | 5 -- .../src/client/linux/handler/Makefile.in | 2 - .../client/linux/minidump_writer/Makefile.in | 60 +++++++++++++++++++ .../google-breakpad/src/common/Makefile.in | 10 ++-- .../src/common/{mac => }/dwarf/Makefile.in | 8 +-- .../src/common/linux/Makefile.in | 6 +- .../src/common/mac/Makefile.in | 2 - .../src/tools/mac/dump_syms/Makefile.in | 2 +- toolkit/toolkit-makefiles.sh | 1 + toolkit/xre/Makefile.in | 1 + 11 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in rename toolkit/crashreporter/google-breakpad/src/common/{mac => }/dwarf/Makefile.in (93%) diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 7f5f789408ed..9f36ffb208b4 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -78,6 +78,7 @@ DIRS += \ google-breakpad/src/common/linux \ google-breakpad/src/client \ google-breakpad/src/client/linux/handler \ + google-breakpad/src/client/linux/minidump_writer \ google-breakpad/src/tools/linux/dump_syms \ $(NULL) endif diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index 4eb5bff190bf..f16b8baa235a 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -84,7 +84,6 @@ LIBS += \ LOCAL_INCLUDES += -I$(srcdir) OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS) OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) -CPPSRCS += http_upload.cc FORCE_USE_PIC=1 endif @@ -96,7 +95,6 @@ LIBS += \ LOCAL_INCLUDES += -I$(srcdir) OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS) OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) -CPPSRCS += http_upload.cc FORCE_USE_PIC=1 endif @@ -114,9 +112,6 @@ libs:: endif ifeq (,$(filter-out Linux SunOS,$(OS_ARCH))) -export:: $(srcdir)/../google-breakpad/src/common/linux/http_upload.cc - $(INSTALL) $^ . - libs:: $(topsrcdir)/toolkit/themes/winstripe/global/throbber/Throbber-small.gif $(INSTALL) $^ $(DIST)/bin endif diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in index 8e0c04ea4560..214c1298f415 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in @@ -49,8 +49,6 @@ LOCAL_INCLUDES = -I$(srcdir)/../../.. CPPSRCS = \ exception_handler.cc \ - minidump_generator.cc \ - linux_thread.cc \ $(NULL) # need static lib diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in new file mode 100644 index 000000000000..51a7cfdfd292 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in @@ -0,0 +1,60 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla Breakpad integration +# +# The Initial Developer of the Original Code is +# The Mozilla Foundation. +# Portions created by the Initial Developer are Copyright (C) 2009 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Ted Mielczarek +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = writer +LIBRARY_NAME = minidump_writer_s +XPI_NAME = crashreporter + +LOCAL_INCLUDES = -I$(srcdir)/../../.. + +CPPSRCS = \ + linux_dumper.cc \ + minidump_writer.cc \ + $(NULL) + +# need static lib +FORCE_STATIC_LIB = 1 +FORCE_USE_PIC = 1 + +include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index bdfe718b431e..8c0f3b2eec80 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -47,6 +47,10 @@ HOST_LIBRARY_NAME = host_breakpad_common_s LOCAL_INCLUDES = -I$(srcdir)/.. +ifeq ($(OS_ARCH),Darwin) +DIRS = dwarf +endif + CPPSRCS = \ string_conversion.cc \ $(NULL) @@ -65,9 +69,3 @@ FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk - -# XXX, bug 417045, make -jN combines badly with -save-temps in -# CFLAGS/CXXFLAGS (for stabs symbols with XCode3) -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -.NOTPARALLEL: -endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/dwarf/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in similarity index 93% rename from toolkit/crashreporter/google-breakpad/src/common/mac/dwarf/Makefile.in rename to toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in index d408b6893d45..89fc4b0f288f 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/dwarf/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in @@ -35,17 +35,17 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../../../../../.. +DEPTH = ../../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = breakpad_mac_dwarf -HOST_LIBRARY_NAME = host_breakpad_mac_dwarf_s +MODULE = breakpad_dwarf +HOST_LIBRARY_NAME = host_breakpad_dwarf_s -LOCAL_INCLUDES = -I$(srcdir)/../../.. +LOCAL_INCLUDES = -I$(srcdir)/../.. HOST_CPPSRCS = \ bytereader.cc \ diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in index 942e1ada45ca..bb87b3525957 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in @@ -47,18 +47,18 @@ HOST_LIBRARY_NAME = host_breakpad_linux_common_s LOCAL_INCLUDES = -I$(srcdir)/../.. -# not compiling http_upload.cc currently -# since it depends on libcurl CPPSRCS = \ - dump_symbols.cc \ file_id.cc \ guid_creator.cc \ + http_upload.cc \ $(NULL) HOST_CPPSRCS = \ dump_symbols.cc \ file_id.cc \ guid_creator.cc \ + module.cc \ + stabs_reader.cc \ $(NULL) # need static lib diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index 3969cc4f60db..c0bdbccc3438 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -47,8 +47,6 @@ HOST_LIBRARY_NAME = host_breakpad_mac_common_s LOCAL_INCLUDES = -I$(srcdir)/../.. -DIRS = dwarf - # This is a little weird, but we're building a host and a target lib here. # The host lib is used for dump_syms, and the target lib for the # crash reporter client. Therefore, we don't need all the srcs in both. diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in index afd1980ca86a..5c03e0308417 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in @@ -53,8 +53,8 @@ HOST_CMMSRCS = \ $(NULL) HOST_LIBS += \ + $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)host_breakpad_mac_common_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/dwarf/$(LIB_PREFIX)host_breakpad_mac_dwarf_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index 71570cdfafe0..89cf722615a5 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -670,6 +670,7 @@ MAKEFILES_xulapp=" toolkit/crashreporter/client/Makefile toolkit/crashreporter/google-breakpad/src/client/Makefile toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile + toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/Makefile diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 40030e7d645f..7c10817fe5f5 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -148,6 +148,7 @@ endif ifeq ($(OS_ARCH),Linux) SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ + $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/$(LIB_PREFIX)minidump_writer_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \