Bug 534664 - [Linux x86-64] 3 "Warning: package error ..."; (Av1) Add the useful part of MOZ_CRASHREPORTER configure.in support, Port bug 503469, Add MOZ_CRASHREPORTER support in removed-files.in.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 29 Mar 2010 19:42:23 +0200
changeset 5317 d64392a6e23fdae02e9f6392de3b863a7aa21739
parent 5316 867fb51b75d88228d17d79b60c48883ece6d38e1
child 5318 1dfde698a59b6669a3ab5e021789457a5946aac3
push idunknown
push userunknown
push dateunknown
bugs534664, 503469
Bug 534664 - [Linux x86-64] 3 "Warning: package error ..."; (Av1) Add the useful part of MOZ_CRASHREPORTER configure.in support, Port bug 503469, Add MOZ_CRASHREPORTER support in removed-files.in. r=kairo. Bug 503469 - Support packaging WinCE Firefox builds as zip, complete.mar
configure.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/configure.in
+++ b/configure.in
@@ -5457,16 +5457,37 @@ dnl = Universalchardet
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(universalchardet,
 [  --disable-universalchardet
                           Disable universal encoding detection],
   MOZ_UNIVERSALCHARDET=,
   MOZ_UNIVERSALCHARDET=1 )
 
 dnl ========================================================
+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 "$OS_ARCH" = "SunOS") \
+   && test -z "$HAVE_64BIT_OS"; then
+   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)
+fi
+
+dnl ========================================================
 dnl SVG
 dnl ========================================================
 if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
 
 MOZ_ARG_DISABLE_BOOL(svg,
 [  --disable-svg            Disable SVG support (NB: unsupported option in comm-central)],
     MOZ_SVG=,
     MOZ_SVG=1 )
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -63,17 +63,19 @@
 #ifndef MOZ_STATIC_BUILD
 @BINPATH@/@DLL_PREFIX@mozz@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #endif
-#ifdef XP_WIN32
+#ifdef WINCE
+@BINPATH@/mozce_shunt.dll
+#elifdef XP_WIN32
 #ifndef MOZ_MEMORY
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
 #else
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
@@ -408,17 +410,19 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/smile.xpt
 @BINPATH@/components/spellchecker.xpt
 @BINPATH@/components/storage.xpt
 @BINPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
 @BINPATH@/components/suitebrowser.xpt
 @BINPATH@/components/suitecommon.xpt
 @BINPATH@/components/suitefeeds.xpt
+#ifndef WINCE
 @BINPATH@/components/suitemigration.xpt
+#endif
 @BINPATH@/components/toolkitprofile.xpt
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/toolkitremote.xpt
 #endif
 @BINPATH@/components/txmgr.xpt
 @BINPATH@/components/txtsvc.xpt
 #ifdef MOZ_USE_NATIVE_UCONV
 @BINPATH@/components/ucnative.xpt
@@ -718,28 +722,29 @@ bin/libfreebl_32int64_3.so
 ; [Updater]
 ;
 #ifdef XP_MACOSX
 @BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
 
-#ifndef XP_OS2
 ; [Crash Reporter]
 ;
+#ifdef MOZ_CRASHREPORTER
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
+; MOZ_CRASHREPORTER
 #endif
 
 ; [ActiveX]
 ; ToDo: check if this is needed or works at all (Bug 524008)
 #ifdef WINCE
 #ifndef MOZ_NO_ACTIVEX_SUPPORT
 @BINPATH@/components/nsAxSecurityPolicy.js
 @BINPATH@/@PREF_DIR@/activex.js
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -93,16 +93,24 @@ components/winhooks.xpt
 #ifdef XP_WIN
 components/wlltvwrs.dll
 #endif
 components/xml-rpc.xpt
 components/@DLL_PREFIX@xmlextras@DLL_SUFFIX@
 #ifdef XP_WIN
 components/xpinstal.dll
 #endif
+#ifndef MOZ_CRASHREPORTER
+#ifdef XP_MACOSX
+crashreporter.app/
+#else
+crashreporter@BIN_SUFFIX@
+crashreporter.ini
+#endif
+#endif
 defaults/wallet/DistinguishedSchema.tbl
 defaults/wallet/FieldSchema.tbl
 defaults/wallet/PositionalSchema.tbl
 defaults/wallet/SchemaConcat.tbl
 defaults/wallet/SchemaStrings.tbl
 defaults/wallet/StateSchema.tbl
 defaults/wallet/VcardSchema.tbl
 #ifdef XP_WIN
@@ -178,16 +186,23 @@ res/maccharset.properties
 res/mathml.css
 res/os2charset.properties
 res/quirk.css
 res/ua.css
 res/unixcharset.properties
 res/viewsource.css
 res/wincharset.properties
 @DLL_PREFIX@sqlite3@DLL_SUFFIX@
+#ifndef MOZ_CRASHREPORTER
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+Throbber-small.gif
+#endif
+#endif
+#endif
 #ifdef XP_MACOSX
 updater.app/Contents/MacOS/updater.ini
 #endif
 #ifdef XP_WIN
 xpicleanup.exe
 #else
 xpicleanup
 #endif