Bug 804639 Package breakpadinjector.dll and configure.in changes from Bug 769048 a=Callek.
authorPhilip Chee <philip.chee@gmail.com>
Sun, 28 Oct 2012 21:03:46 +0800
changeset 14122 fb158bb8a166d6b30bdb70e83cdc3c126c5a6fad
parent 14121 a03c8b87763eb45142b81f6cfad9df8b83d8ce2d
child 14123 2dead7fe49ddc58a916ff46cd152ba379ee10863
push id804
push userbugzilla@standard8.plus.com
push dateMon, 07 Jan 2013 21:31:35 +0000
treeherdercomm-beta@9fdc5c67cdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs804639, 769048
Bug 804639 Package breakpadinjector.dll and configure.in changes from Bug 769048 a=Callek.
configure.in
mail/installer/package-manifest.in
suite/installer/package-manifest.in
--- a/configure.in
+++ b/configure.in
@@ -4930,16 +4930,21 @@ esac
 
 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" = "WINNT" -a -z "$HAVE_64BIT_OS"; then
+    MOZ_CRASHREPORTER_INJECTOR=1
+    AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
+  fi
 fi
 
 dnl ========================================================
 dnl Build Freetype in the tree
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(tree-freetype,
 [  --enable-tree-freetype         Enable Tree FreeType],
     MOZ_TREE_FREETYPE=1,
@@ -6404,16 +6409,17 @@ AC_SUBST(MOZ_PROFILELOCKING)
 
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_SPELLCHECK)
 AC_SUBST(MOZ_USER_DIR)
 AC_SUBST(MOZ_CRASHREPORTER)
+AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
 AC_SUBST(MOZ_MAINTENANCE_SERVICE)
 AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
 AC_SUBST(MOZ_ANGLE)
 AC_SUBST(MOZ_DIRECTX_SDK_PATH)
 AC_SUBST(MOZ_DIRECTX_SDK_CPU_SUFFIX)
 AC_SUBST(MOZ_D3DX9_VERSION)
 AC_SUBST(MOZ_D3DX9_CAB)
 AC_SUBST(MOZ_D3DCOMPILER_CAB)
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -741,14 +741,17 @@
 #ifndef XP_OS2
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
 #endif
+#ifdef MOZ_CRASHREPORTER_INJECTOR
+@BINPATH@/breakpadinjector.dll
+#endif
 #endif
 
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -595,17 +595,17 @@
 ; Layout debug extension.
 #ifdef ENABLE_TESTS
 #ifdef MOZ_DEBUG
 @BINPATH@/chrome/layoutdebug@JAREXT@
 @BINPATH@/chrome/layoutdebug.manifest
 @BINPATH@/components/layout_debug.xpt
 #endif
 #endif
-; Style Sheets, Graphics and other Resources used by the layout engine. 
+; Style Sheets, Graphics and other Resources used by the layout engine.
 @BINPATH@/res/contenteditable.css
 @BINPATH@/res/designmode.css
 @BINPATH@/res/EditorOverride.css
 @BINPATH@/res/grabber.gif
 @BINPATH@/res/langGroups.properties
 @BINPATH@/res/language.properties
 @BINPATH@/res/svg.css
 @BINPATH@/res/table-add-column-after-active.gif
@@ -700,16 +700,19 @@ bin/libfreebl_32int64_3.so
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
 @BINPATH@/crashreporter-override.ini
+#ifdef MOZ_CRASHREPORTER_INJECTOR
+@BINPATH@/breakpadinjector.dll
+#endif
 #endif
 
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
 @BINPATH@/*.xqs
 @BINPATH@/components/*.xqs
 #endif