bug 389548 - fixup from cvs copy (airbag -> crashreporter). also note that this renames the configure flag from --disable-airbag to --disable-crashreporter. r=bsmedberg
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,17 +129,17 @@ ifdef MOZ_PROFILE
/bin/find $(DIST) -name "*.dbg" -exec mv {} $(DIST)/$(BUILDID) \;
endif # MOZ_PROFILE
endif # MOZILLA_OFFICIAL
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
ifeq ($(OS_ARCH),Darwin)
# need to pass arch flags for universal builds
ifdef UNIVERSAL_BINARY
MAKE_SYM_STORE_ARGS := -a "ppc i386" --vcs-info
MAKE_SYM_STORE_PATH := $(DIST)/universal
@@ -155,35 +155,35 @@ DUMP_SYMS_BIN := $(DIST)/host/bin/dump_s
MAKE_SYM_STORE_PATH := $(DIST)/bin
endif
ifdef MOZ_SYMBOLS_EXTRA_BUILDID
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) > \
$(DIST)/crashreporter-symbols/$(BUILDID)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
echo packing symbols
mkdir -p $(topsrcdir)/../$(BUILDID)
cd $(DIST)/crashreporter-symbols/$(BUILDID) && \
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)
signnss:
ifdef MOZILLA_OFFICIAL
echo signing NSS libs
cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll
cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -814,27 +814,27 @@ xulrunner/app/profile/chrome/Makefile
xulrunner/app/profile/extensions/Makefile
xulrunner/installer/Makefile
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
toolkit/components/alerts/Makefile
toolkit/components/alerts/public/Makefile
toolkit/components/alerts/src/Makefile
toolkit/components/autocomplete/Makefile
toolkit/components/autocomplete/public/Makefile
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -148,17 +148,17 @@ MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKM
MOZ_STORAGE = @MOZ_STORAGE@
MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
MOZ_MORK = @MOZ_MORK@
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@
JAVA_INCLUDE_PATH="@JAVA_INCLUDE_PATH@"
JAVA="@JAVA@"
JAVAC="@JAVAC@"
JAR="@JAR@"
--- a/configure.in
+++ b/configure.in
@@ -5305,46 +5305,46 @@ if test -n "${MOZ_JAVAXPCOM}"; then
AC_PATH_PROG(JAVAC, javac, :, [$JAVA_PATH])
AC_PATH_PROG(JAR, jar, :, [$JAVA_PATH])
if test -z "$JAVA" || test "$JAVA" = ":" || test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
AC_MSG_ERROR([The programs java, javac and jar were not found. Set \$JAVA_HOME to your java sdk directory, use --with-java-bin-path={java-bin-dir}, or reconfigure with --disable-javaxpcom.])
fi
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
-fi
-
-MOZ_ARG_DISABLE_BOOL(airbag,
-[ --disable-airbag Disable airbag crash reporting],
- MOZ_AIRBAG=,
- MOZ_AIRBAG=1)
-
-if test -n "$MOZ_AIRBAG"; then
- AC_DEFINE(MOZ_AIRBAG)
+ MOZ_CRASHREPORTER=1
+fi
+
+MOZ_ARG_DISABLE_BOOL(crashreporter,
+[ --disable-crashreporter Disable breakpad crash reporting],
+ MOZ_CRASHREPORTER=,
+ MOZ_CRASHREPORTER=1)
+
+if test -n "$MOZ_CRASHREPORTER"; then
+ AC_DEFINE(MOZ_CRASHREPORTER)
if test "$OS_ARCH" = "Linux" && \
test -z "$SKIP_LIBRARY_CHECKS"; then
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -lcurl"
AC_CACHE_CHECK(for libcurl,
ac_cv_have_libcurl,
[AC_TRY_LINK([#include <curl/curl.h>],
[curl_easy_init();],
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
fi
dnl ========================================================
dnl = Build mochitest JS/DOM tests (on by default)
dnl ========================================================
@@ -7462,17 +7462,17 @@ AC_SUBST(IBMBIDI)
AC_SUBST(SUNCTL)
AC_SUBST(MOZ_UNIVERSALCHARDET)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_XPINSTALL)
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)
AC_SUBST(USE_ELF_DYNSTR_GC)
AC_SUBST(USE_PREBINDING)
AC_SUBST(INCREMENTAL_LINKER)
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -6,17 +6,17 @@
# 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 Airbag integration
+# The Original Code is Mozilla Breakpad integration
#
# The Initial Developer of the Original Code is
# Ted Mielczarek <ted.mielczarek@gmail.com>
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
@@ -50,60 +50,60 @@ REQUIRES = \
string \
xulapp \
$(NULL)
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
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
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 = \
nsICrashReporter.idl \
$(NULL)
EXPORTS = \
- nsAirbagExceptionHandler.h \
+ nsExceptionHandler.h \
$(NULL)
CPPSRCS = \
- nsAirbagExceptionHandler.cpp \
+ nsExceptionHandler.cpp \
$(NULL)
FORCE_STATIC_LIB = 1
ifdef ENABLE_TESTS
DIRS += test
endif
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -46,48 +46,48 @@ include $(DEPTH)/config/autoconf.mk
PROGRAM = crashreporter$(BIN_SUFFIX)
DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
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
DEFINES += -DUNICODE -D_UNICODE
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi)
MOZ_WINCONSOLE = 0
endif
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)
OS_LIBS += $(MOZ_GTK2_LIBS) -lcurl
CPPSRCS += http_upload.cc
FORCE_USE_PIC=1
endif
@@ -102,11 +102,11 @@ libs::
$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS
$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS
rm -f $(DIST)/bin/crashreporter
$(NSINSTALL) $(DIST)/bin/crashreporter.ini $(DIST)/bin/crashreporter.app/Contents/MacOS
rm -f $(DIST)/bin/crashreporter.ini
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
--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
@@ -48,17 +48,17 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../../../common/linux \
$(NULL)
HOST_CPPSRCS = \
dump_syms.cc \
$(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
CPP_PROG_LINK = 1
FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile.in
@@ -48,18 +48,18 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../../../common/mac \
$(NULL)
HOST_CMSRCS = \
dump_syms_tool.m \
$(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 += \
-framework Foundation \
-lcrypto \
$(NULL)
# force C++ linking
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -7,17 +7,17 @@
* 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 Airbag integration
+ * The Original Code is Mozilla Breakpad integration
*
* The Initial Developer of the Original Code is
* Ted Mielczarek <ted.mielczarek@gmail.com>
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
@@ -30,17 +30,17 @@
* 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 ***** */
-#include "nsAirbagExceptionHandler.h"
+#include "nsExceptionHandler.h"
#if defined(XP_WIN32)
#ifdef WIN32_LEAN_AND_MEAN
#undef WIN32_LEAN_AND_MEAN
#endif
#include "client/windows/handler/exception_handler.h"
#include <string.h>
@@ -57,17 +57,17 @@
#include <fcntl.h>
#include <sys/types.h>
#include <unistd.h>
#else
#error "Not yet implemented for this platform"
#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>
#include <time.h>
#include <prenv.h>
#include <prio.h>
#include "nsDebug.h"
#include "nsCRT.h"
--- a/toolkit/crashreporter/nsExceptionHandler.h
+++ b/toolkit/crashreporter/nsExceptionHandler.h
@@ -7,17 +7,17 @@
* 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 Airbag integration
+ * The Original Code is Mozilla Breakpad integration
*
* The Initial Developer of the Original Code is
* Ted Mielczarek <ted.mielczarek@gmail.com>
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
@@ -30,27 +30,27 @@
* 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 ***** */
-#ifndef nsAirbagExceptionHandler_h__
-#define nsAirbagExceptionHandler_h__
+#ifndef nsExceptionHandler_h__
+#define nsExceptionHandler_h__
#include "nscore.h"
#include "nsXPCOM.h"
#include "nsStringGlue.h"
namespace CrashReporter {
nsresult SetExceptionHandler(nsILocalFile* aXREDirectory,
const char* aServerURL);
nsresult SetMinidumpPath(const nsAString& aPath);
nsresult UnsetExceptionHandler();
nsresult AnnotateCrashReport(const nsACString &key, const nsACString &data);
nsresult SetRestartArgs(int argc, char **argv);
nsresult SetupExtraData(nsILocalFile* aAppDataDirectory,
const nsACString& aBuildID);
}
-#endif /* nsAirbagExceptionHandler_h__ */
+#endif /* nsExceptionHandler_h__ */
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -54,47 +54,47 @@ REQUIRES = \
crashreporter \
$(NULL)
LIBS = \
$(EXTRA_DSO_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
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
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
ifndef MOZ_ENABLE_LIBXUL
check:: $(PROGRAM)
$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCrashReporterAPI
endif
--- a/toolkit/crashreporter/test/TestCrashReporterAPI.cpp
+++ b/toolkit/crashreporter/test/TestCrashReporterAPI.cpp
@@ -43,17 +43,17 @@
#include "nsISimpleEnumerator.h"
#include "nsIServiceManager.h"
#include "nsServiceManagerUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIProperties.h"
#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)) \
return message; } while (0)
#define mu_assert_failure(message, test) do { if (NS_SUCCEEDED(test)) \
return message; } while (0)
#define mu_run_test(test) do { char *message = test(); tests_run++; \
if (message) return message; } while (0)
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -80,17 +80,17 @@ REQUIRES = \
ifdef MOZ_JPROF
REQUIRES += jprof
endif
ifdef NS_TRACE_MALLOC
REQUIRES += tracemalloc
endif
-ifdef MOZ_AIRBAG
+ifdef MOZ_CRASHREPORTER
REQUIRES += crashreporter
endif
FORCE_STATIC_LIB = 1
XPIDLSRCS = \
nsINativeAppSupport.idl \
nsIXULRuntime.idl \
@@ -187,38 +187,38 @@ endif
SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
ifdef MOZ_ENABLE_XREMOTE
SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
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
include $(topsrcdir)/config/rules.mk
ifdef BUILD_STATIC_LIBS
export::
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -186,18 +186,18 @@ extern "C" void ShowOSAlert(const char*
#ifdef DEBUG
#include "prlog.h"
#endif
#ifdef MOZ_JPROF
#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
// on x86 linux, the current builds of some popular plugins (notably
// flashplayer and real) expect a few builtin symbols from libgcc
// which were available in some older versions of gcc. However,
// they're _NOT_ available in newer versions of gcc (eg 3.1), so if
@@ -521,43 +521,43 @@ PRBool gSafeMode = PR_FALSE;
/**
* The nsXULAppInfo object implements nsIFactory so that it can be its own
* singleton.
*/
class nsXULAppInfo : public nsIXULAppInfo,
#ifdef XP_WIN
public nsIWinAppHelper,
#endif
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
public nsICrashReporter,
#endif
public nsIXULRuntime
{
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIXULAPPINFO
NS_DECL_NSIXULRUNTIME
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
NS_DECL_NSICRASHREPORTER
#endif
#ifdef XP_WIN
NS_DECL_NSIWINAPPHELPER
private:
nsresult LaunchAppHelperWithArgs(int aArgc, char **aArgv);
#endif
};
NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULRuntime)
NS_INTERFACE_MAP_ENTRY(nsIXULRuntime)
#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)
NS_INTERFACE_MAP_END
NS_IMETHODIMP_(nsrefcnt)
nsXULAppInfo::AddRef()
{
@@ -746,17 +746,17 @@ nsXULAppInfo::PostUpdate(nsILocalFile *a
if (pathArg)
PR_smprintf_free(pathArg);
free(upgradeArgv);
return rv;
}
#endif
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
NS_IMETHODIMP
nsXULAppInfo::AnnotateCrashReport(const nsACString& key,
const nsACString& data)
{
return CrashReporter::AnnotateCrashReport(key, data);
}
#endif
@@ -830,17 +830,17 @@ ScopedXPCOMStartup::~ScopedXPCOMStartup(
static nsModuleComponentInfo kComponents[] =
{
{
"nsXULAppInfo",
APPINFO_CID,
XULAPPINFO_SERVICE_CONTRACTID,
AppInfoConstructor
}
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
,
{
"nsXULAppInfo",
APPINFO_CID,
NS_CRASHREPORTER_CONTRACTID,
AppInfoConstructor
}
#endif
@@ -2234,18 +2234,18 @@ static void SaveStateForAppInitiatedRest
static void RestoreStateForAppInitiatedRestart()
{
for (size_t i = 0; i < NS_ARRAY_LENGTH(gSavedVars); ++i) {
if (gSavedVars[i].value)
PR_SetEnv(gSavedVars[i].value);
}
}
-#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.
static void MakeOrSetMinidumpPath(nsIFile* profD)
{
nsCOMPtr<nsIFile> dumpD;
nsresult rv = profD->Clone(getter_AddRefs(dumpD));
@@ -2498,19 +2498,19 @@ XRE_main(int argc, char* argv[], const n
Output(PR_TRUE, "Error: Platform version '%s' is not compatible with\n"
"minVersion >= %s\nmaxVersion <= %s\n",
gToolkitVersion,
appData.minVersion, appData.maxVersion);
return 1;
}
}
-#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;
}
if ((appData.flags & NS_XRE_ENABLE_CRASH_REPORTER) &&
NS_SUCCEEDED(
CrashReporter::SetExceptionHandler(appData.xreDirectory,
appData.crashReporterURL))) {
// pass some basic info from the app data
@@ -2793,17 +2793,17 @@ XRE_main(int argc, char* argv[], const n
rv = profileLock->GetLocalDirectory(getter_AddRefs(profLD));
NS_ENSURE_SUCCESS(rv, 1);
rv = dirProvider.SetProfile(profD, profLD);
NS_ENSURE_SUCCESS(rv, 1);
//////////////////////// NOW WE HAVE A PROFILE ////////////////////////
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
MakeOrSetMinidumpPath(profD);
#endif
PRBool upgraded = PR_FALSE;
nsCAutoString version;
BuildVersion(version);
@@ -3142,24 +3142,24 @@ XRE_main(int argc, char* argv[], const n
// Leak it with extreme prejudice!
PR_SetEnv(ToNewCString(desktopStartupEnv));
}
}
#endif
rv = LaunchChild(nativeApp, appInitiatedRestart, upgraded ? -1 : 0);
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
CrashReporter::UnsetExceptionHandler();
#endif
return rv == NS_ERROR_LAUNCHED_CHILD_PROCESS ? 0 : 1;
}
}
-#ifdef MOZ_AIRBAG
+#ifdef MOZ_CRASHREPORTER
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
CrashReporter::UnsetExceptionHandler();
#endif
return NS_FAILED(rv) ? 1 : 0;
}