mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
bug 389548 - fixup from cvs copy (airbag -> crashreporter). also note that this renames the configure flag from --disable-airbag to --disable-crashreporter. r=bsmedberg
This commit is contained in:
ted.mielczarek@gmail.com
parent
13f57c3fe0
commit
7050a93f24
12
Makefile.in
12
Makefile.in
@ -134,7 +134,7 @@ endif # WINNT
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
# we want to copy PDB files on Windows
|
||||
MAKE_SYM_STORE_ARGS := -c
|
||||
DUMP_SYMS_BIN := $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe
|
||||
DUMP_SYMS_BIN := $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms.exe
|
||||
# PDB files don't get moved to dist, so we need to scan the whole objdir
|
||||
MAKE_SYM_STORE_PATH := .
|
||||
endif
|
||||
@ -160,10 +160,10 @@ EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
|
||||
endif
|
||||
|
||||
buildsymbols:
|
||||
ifdef MOZ_AIRBAG
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
echo building symbol store
|
||||
mkdir -p $(DIST)/crashreporter-symbols/$(BUILDID)
|
||||
$(PYTHON) $(topsrcdir)/toolkit/airbag/tools/symbolstore.py \
|
||||
$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \
|
||||
$(MAKE_SYM_STORE_ARGS) -s $(topsrcdir) $(DUMP_SYMS_BIN) \
|
||||
$(DIST)/crashreporter-symbols/$(BUILDID) \
|
||||
$(MAKE_SYM_STORE_PATH) > \
|
||||
@ -174,11 +174,11 @@ ifdef MOZ_AIRBAG
|
||||
zip -r9D ../crashreporter-symbols-$(BUILDID).zip .
|
||||
mv $(DIST)/crashreporter-symbols/crashreporter-symbols-$(BUILDID).zip \
|
||||
$(topsrcdir)/../$(BUILDID)
|
||||
endif # MOZ_AIRBAG
|
||||
endif # MOZ_CRASHREPORTER
|
||||
|
||||
uploadsymbols:
|
||||
ifdef MOZ_AIRBAG
|
||||
$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/crashreporter-symbols-$(BUILDID).zip
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
$(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/crashreporter-symbols-$(BUILDID).zip
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
||||
@ -819,17 +819,17 @@ xulrunner/installer/mac/Makefile
|
||||
MAKEFILES_xulapp="
|
||||
toolkit/Makefile
|
||||
toolkit/library/Makefile
|
||||
toolkit/airbag/Makefile
|
||||
toolkit/airbag/client/Makefile
|
||||
toolkit/airbag/airbag/src/client/Makefile
|
||||
toolkit/airbag/airbag/src/client/mac/handler/Makefile
|
||||
toolkit/airbag/airbag/src/client/windows/Makefile
|
||||
toolkit/airbag/airbag/src/client/windows/handler/Makefile
|
||||
toolkit/airbag/airbag/src/client/windows/sender/Makefile
|
||||
toolkit/airbag/airbag/src/common/Makefile
|
||||
toolkit/airbag/airbag/src/common/mac/Makefile
|
||||
toolkit/airbag/airbag/src/common/windows/Makefile
|
||||
toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile
|
||||
toolkit/crashreporter/Makefile
|
||||
toolkit/crashreporter/client/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/client/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/client/windows/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/common/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/common/mac/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/common/windows/Makefile
|
||||
toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile
|
||||
toolkit/content/Makefile
|
||||
toolkit/content/buildconfig.html
|
||||
toolkit/obsolete/Makefile
|
||||
|
||||
@ -153,7 +153,7 @@ MOZ_MORKREADER = @MOZ_MORKREADER@
|
||||
MOZ_NO_XPCOM_OBSOLETE = @MOZ_NO_XPCOM_OBSOLETE@
|
||||
MOZ_NO_FAST_LOAD = @MOZ_NO_FAST_LOAD@
|
||||
NS_PRINTING = @NS_PRINTING@
|
||||
MOZ_AIRBAG = @MOZ_AIRBAG@
|
||||
MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@
|
||||
MOZ_MOCHITEST = @MOZ_MOCHITEST@
|
||||
|
||||
MOZ_JAVAXPCOM = @MOZ_JAVAXPCOM@
|
||||
|
||||
20
configure.in
20
configure.in
@ -5310,23 +5310,23 @@ if test -n "${MOZ_JAVAXPCOM}"; then
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Airbag crash reporting (on by default on supported platforms)
|
||||
dnl = Breakpad crash reporting (on by default on supported platforms)
|
||||
dnl ========================================================
|
||||
|
||||
if (test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
|
||||
|| test "$OS_ARCH" = "Darwin" \
|
||||
|| test "$OS_ARCH" = "Linux" -a "$CPU_ARCH" = "x86") \
|
||||
&& test -z "$HAVE_64BIT_OS"; then
|
||||
MOZ_AIRBAG=1
|
||||
MOZ_CRASHREPORTER=1
|
||||
fi
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(airbag,
|
||||
[ --disable-airbag Disable airbag crash reporting],
|
||||
MOZ_AIRBAG=,
|
||||
MOZ_AIRBAG=1)
|
||||
MOZ_ARG_DISABLE_BOOL(crashreporter,
|
||||
[ --disable-crashreporter Disable breakpad crash reporting],
|
||||
MOZ_CRASHREPORTER=,
|
||||
MOZ_CRASHREPORTER=1)
|
||||
|
||||
if test -n "$MOZ_AIRBAG"; then
|
||||
AC_DEFINE(MOZ_AIRBAG)
|
||||
if test -n "$MOZ_CRASHREPORTER"; then
|
||||
AC_DEFINE(MOZ_CRASHREPORTER)
|
||||
|
||||
if test "$OS_ARCH" = "Linux" && \
|
||||
test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
@ -5339,7 +5339,7 @@ if test -n "$MOZ_AIRBAG"; then
|
||||
ac_cv_have_libcurl="yes",
|
||||
ac_cv_have_libcurl="no")])
|
||||
if test "$ac_cv_have_libcurl" = "no"; then
|
||||
AC_MSG_ERROR([Couldn't find libcurl, which is required for the crash reporter. Use --disable-airbag to disable the crash reporter.])
|
||||
AC_MSG_ERROR([Couldn't find libcurl, which is required for the crash reporter. Use --disable-crashreporter to disable the crash reporter.])
|
||||
fi
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
fi
|
||||
@ -7467,7 +7467,7 @@ AC_SUBST(MOZ_VIEW_SOURCE)
|
||||
AC_SUBST(MOZ_SPELLCHECK)
|
||||
AC_SUBST(MOZ_XPFE_COMPONENTS)
|
||||
AC_SUBST(MOZ_USER_DIR)
|
||||
AC_SUBST(MOZ_AIRBAG)
|
||||
AC_SUBST(MOZ_CRASHREPORTER)
|
||||
AC_SUBST(MOZ_MOCHITEST)
|
||||
|
||||
AC_SUBST(ENABLE_STRIP)
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Airbag integration
|
||||
# The Original Code is Mozilla Breakpad integration
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Ted Mielczarek <ted.mielczarek@gmail.com>
|
||||
@ -55,8 +55,8 @@ DIRS = \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
DIRS += airbag/src/common/windows \
|
||||
airbag/src/client/windows \
|
||||
DIRS += google-breakpad/src/common/windows \
|
||||
google-breakpad/src/client/windows \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
@ -64,11 +64,11 @@ ifeq ($(OS_ARCH),Darwin)
|
||||
CMMSRCS = mac_utils.mm
|
||||
|
||||
DIRS += \
|
||||
airbag/src/common \
|
||||
airbag/src/common/mac \
|
||||
airbag/src/client \
|
||||
airbag/src/client/mac/handler \
|
||||
airbag/src/tools/mac/dump_syms \
|
||||
google-breakpad/src/common \
|
||||
google-breakpad/src/common/mac \
|
||||
google-breakpad/src/client \
|
||||
google-breakpad/src/client/mac/handler \
|
||||
google-breakpad/src/tools/mac/dump_syms \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
@ -76,17 +76,17 @@ ifeq ($(OS_ARCH),Linux)
|
||||
# there's no define for this normally
|
||||
DEFINES += -DXP_LINUX
|
||||
DIRS += \
|
||||
airbag/src/common \
|
||||
airbag/src/common/linux \
|
||||
airbag/src/client \
|
||||
airbag/src/client/linux/handler \
|
||||
airbag/src/tools/linux/dump_syms \
|
||||
google-breakpad/src/common \
|
||||
google-breakpad/src/common/linux \
|
||||
google-breakpad/src/client \
|
||||
google-breakpad/src/client/linux/handler \
|
||||
google-breakpad/src/tools/linux/dump_syms \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
DIRS += client
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/airbag/src
|
||||
LOCAL_INCLUDES = -I$(srcdir)/google-breakpad/src
|
||||
DEFINES += -DUNICODE -D_UNICODE
|
||||
|
||||
XPIDLSRCS = \
|
||||
@ -94,11 +94,11 @@ XPIDLSRCS = \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
nsAirbagExceptionHandler.h \
|
||||
nsExceptionHandler.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsAirbagExceptionHandler.cpp \
|
||||
nsExceptionHandler.cpp \
|
||||
$(NULL)
|
||||
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
@ -51,15 +51,15 @@ REQUIRES = sender
|
||||
#XXX: should move to toolkit/locale
|
||||
DIST_FILES = crashreporter.ini
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../airbag/src
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
|
||||
|
||||
CPPSRCS = crashreporter.cpp
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS += crashreporter_win.cpp
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/windows/sender/$(LIB_PREFIX)crash_report_sender_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/sender/$(LIB_PREFIX)crash_report_sender_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
LOCAL_INCLUDES += -I$(srcdir)
|
||||
RCINCLUDE = crashreporter.rc
|
||||
@ -72,17 +72,17 @@ ifeq ($(OS_ARCH),Darwin)
|
||||
CMMSRCS += crashreporter_osx.mm
|
||||
OS_LIBS += -framework Cocoa
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../airbag/src/common/mac/
|
||||
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../google-breakpad/src/common/mac/
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
CPPSRCS += crashreporter_linux.cpp
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
LOCAL_INCLUDES += -I$(srcdir)
|
||||
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||
@ -107,6 +107,6 @@ libs::
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
export:: $(srcdir)/../airbag/src/common/linux/http_upload.cc
|
||||
export:: $(srcdir)/../google-breakpad/src/common/linux/http_upload.cc
|
||||
$(INSTALL) $^ .
|
||||
endif
|
||||
|
||||
@ -53,8 +53,8 @@ HOST_CPPSRCS = \
|
||||
$(NULL)
|
||||
|
||||
HOST_LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)host_breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# force C++ linking
|
||||
|
||||
@ -53,8 +53,8 @@ HOST_CMSRCS = \
|
||||
$(NULL)
|
||||
|
||||
HOST_LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)host_breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)host_breakpad_common_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/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
HOST_LDFLAGS += \
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Airbag integration
|
||||
* The Original Code is Mozilla Breakpad integration
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Ted Mielczarek <ted.mielczarek@gmail.com>
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsAirbagExceptionHandler.h"
|
||||
#include "nsExceptionHandler.h"
|
||||
|
||||
#if defined(XP_WIN32)
|
||||
#ifdef WIN32_LEAN_AND_MEAN
|
||||
@ -62,7 +62,7 @@
|
||||
#endif // defined(XP_WIN32)
|
||||
|
||||
#ifndef HAVE_CPP_2BYTE_WCHAR_T
|
||||
#error "This code expects a 2 byte wchar_t. You should --disable-airbag."
|
||||
#error "This code expects a 2 byte wchar_t. You should --disable-crashreporter."
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Airbag integration
|
||||
* The Original Code is Mozilla Breakpad integration
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Ted Mielczarek <ted.mielczarek@gmail.com>
|
||||
@ -35,8 +35,8 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef nsAirbagExceptionHandler_h__
|
||||
#define nsAirbagExceptionHandler_h__
|
||||
#ifndef nsExceptionHandler_h__
|
||||
#define nsExceptionHandler_h__
|
||||
|
||||
#include "nscore.h"
|
||||
#include "nsXPCOM.h"
|
||||
@ -53,4 +53,4 @@ nsresult SetupExtraData(nsILocalFile* aAppDataDirectory,
|
||||
const nsACString& aBuildID);
|
||||
}
|
||||
|
||||
#endif /* nsAirbagExceptionHandler_h__ */
|
||||
#endif /* nsExceptionHandler_h__ */
|
||||
|
||||
@ -59,7 +59,7 @@ LIBS = \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(DEPTH)/toolkit/airbag/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
@ -68,8 +68,8 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
|
||||
LIBS += $(call expand_libname shell32)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,ole32)
|
||||
endif
|
||||
@ -77,20 +77,20 @@ endif
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
OS_LIBS += -framework Cocoa -lcrypto
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../airbag/src/common/mac/
|
||||
LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../google-breakpad/src/common/mac/
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/linux/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/handler/$(LIB_PREFIX)exception_handler_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) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsILocalFile.h"
|
||||
|
||||
#include "nsAirbagExceptionHandler.h"
|
||||
#include "nsExceptionHandler.h"
|
||||
#include "nsICrashReporter.h"
|
||||
|
||||
#define mu_assert(message, test) do { if (NS_FAILED(test)) \
|
||||
|
||||
@ -85,7 +85,7 @@ ifdef NS_TRACE_MALLOC
|
||||
REQUIRES += tracemalloc
|
||||
endif
|
||||
|
||||
ifdef MOZ_AIRBAG
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
REQUIRES += crashreporter
|
||||
endif
|
||||
|
||||
@ -192,28 +192,28 @@ SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_cl
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
|
||||
endif
|
||||
|
||||
ifdef MOZ_AIRBAG
|
||||
SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/airbag/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX)
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX)
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/linux/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/airbag/airbag/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/handler/$(LIB_PREFIX)exception_handler_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) \
|
||||
$(NULL)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -191,8 +191,8 @@ extern "C" void ShowOSAlert(const char* aMessage);
|
||||
#include "jprof.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
#include "nsAirbagExceptionHandler.h"
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
#include "nsExceptionHandler.h"
|
||||
#include "nsICrashReporter.h"
|
||||
#define NS_CRASHREPORTER_CONTRACTID "@mozilla.org/toolkit/crash-reporter;1"
|
||||
#endif
|
||||
@ -526,7 +526,7 @@ class nsXULAppInfo : public nsIXULAppInfo,
|
||||
#ifdef XP_WIN
|
||||
public nsIWinAppHelper,
|
||||
#endif
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
public nsICrashReporter,
|
||||
#endif
|
||||
public nsIXULRuntime
|
||||
@ -536,7 +536,7 @@ public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_DECL_NSIXULAPPINFO
|
||||
NS_DECL_NSIXULRUNTIME
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
NS_DECL_NSICRASHREPORTER
|
||||
#endif
|
||||
#ifdef XP_WIN
|
||||
@ -552,7 +552,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
|
||||
#ifdef XP_WIN
|
||||
NS_INTERFACE_MAP_ENTRY(nsIWinAppHelper)
|
||||
#endif
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
NS_INTERFACE_MAP_ENTRY(nsICrashReporter)
|
||||
#endif
|
||||
NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData)
|
||||
@ -751,7 +751,7 @@ nsXULAppInfo::PostUpdate(nsILocalFile *aLogFile)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
NS_IMETHODIMP
|
||||
nsXULAppInfo::AnnotateCrashReport(const nsACString& key,
|
||||
const nsACString& data)
|
||||
@ -835,7 +835,7 @@ static nsModuleComponentInfo kComponents[] =
|
||||
XULAPPINFO_SERVICE_CONTRACTID,
|
||||
AppInfoConstructor
|
||||
}
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
,
|
||||
{
|
||||
"nsXULAppInfo",
|
||||
@ -2239,8 +2239,8 @@ static void RestoreStateForAppInitiatedRestart()
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
// When we first initialize airbag we don't have a profile,
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
// When we first initialize the crash reporter we don't have a profile,
|
||||
// so we set the minidump path to $TEMP. Once we have a profile,
|
||||
// we set it to $PROFILE/minidumps, creating the directory
|
||||
// if needed.
|
||||
@ -2503,9 +2503,9 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
const char* airbagEnv = PR_GetEnv("MOZ_CRASHREPORTER");
|
||||
if (airbagEnv && *airbagEnv) {
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
const char* crashreporterEnv = PR_GetEnv("MOZ_CRASHREPORTER");
|
||||
if (crashreporterEnv && *crashreporterEnv) {
|
||||
appData.flags |= NS_XRE_ENABLE_CRASH_REPORTER;
|
||||
}
|
||||
|
||||
@ -2798,7 +2798,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||
|
||||
//////////////////////// NOW WE HAVE A PROFILE ////////////////////////
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
|
||||
MakeOrSetMinidumpPath(profD);
|
||||
#endif
|
||||
@ -3147,7 +3147,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||
|
||||
rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0);
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
|
||||
CrashReporter::UnsetExceptionHandler();
|
||||
#endif
|
||||
@ -3156,7 +3156,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_AIRBAG
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
|
||||
CrashReporter::UnsetExceptionHandler();
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user