Bustage-fix follow-up to bug 713133 - Don't try to package the MSVC DLLs when in debug mode. r=bustage-fix for CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 04 Feb 2013 14:17:16 +0000
changeset 14787 ca8526c33ec9bc9f2f25c9e681dac30098c39499
parent 14786 0317bb637a4842e5e4ef59d43c78db919937b313
child 14788 ee851cfee5b635cdc4b1bc3e1a36911e89d5125f
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs713133
Bustage-fix follow-up to bug 713133 - Don't try to package the MSVC DLLs when in debug mode. r=bustage-fix for CLOSED TREE
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -9,23 +9,20 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
-# XXX Bug 835309 - this causes errors on Mac currently
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Some files have been already bundled with xulrunner
 ifndef SYSTEM_LIBXUL
 MOZ_PKG_FATAL_WARNINGS = 1
 endif
-endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
 	mail \
 	newsblog \
 	offline \
 	$(NULL)
 
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -52,16 +52,17 @@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 #ifdef XP_WIN32
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
+#ifndef MOZ_DEBUG
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
 #elif _MSC_VER == 1500
 @BINPATH@/Microsoft.VC90.CRT.manifest
 @BINPATH@/msvcm90.dll
@@ -70,16 +71,17 @@
 #elif _MSC_VER == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #elif _MSC_VER == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
 #endif
 #endif
+#endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef MOZ_SHARED_MOZGLUE
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@