Fix windows bustage (looking for msvcp80.dll) following the Lorentz landing on 1.9.2. rs=philor,no bug
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 08 Apr 2010 19:29:25 +0100
changeset 5402 5c3ab02dab302404ba19840d7d0033a63dfd14bb
parent 5401 e677ea9438fa1e3538048a1094b3f648cbef94ff
child 5403 77fe4fa534da552fe317b5f2f1dfbe84ac3ce148
push idunknown
push userunknown
push dateunknown
reviewersphilor, no
Fix windows bustage (looking for msvcp80.dll) following the Lorentz landing on 1.9.2. rs=philor,no bug
configure.in
mail/installer/package-manifest.in
mail/installer/removed-files.in
--- a/configure.in
+++ b/configure.in
@@ -6094,24 +6094,17 @@ if test "$MOZ_MEMORY"; then
     esac
 
     if test ! -d "$WIN32_CRT_SRC_DIR"; then
       AC_MSG_ERROR([Invalid Win32 CRT source directory: ${WIN32_CRT_SRC_DIR}])
     fi
     WIN32_CRT_SRC_DIR=`cd "$WIN32_CRT_SRC_DIR" && pwd -W`
     _objdir_win=`pwd -W`
     WIN32_CUSTOM_CRT_DIR="$_objdir_win/mozilla/memory/jemalloc/crtsrc/build/$_WIN32_CRT_CPU"
-    if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-    dnl Statically link the C++ stdlib.  We only use this for Breakpad anyway.
-    AC_DEFINE(_STATIC_CPPLIB)
-
-    MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -DEFAULTLIB:mozcrt19"
-    else
     MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt19 -DEFAULTLIB:mozcpp19"
-    fi
     dnl Also pass this to NSPR/NSS
     DLLFLAGS="$DLLFLAGS $MOZ_MEMORY_LDFLAGS"
     export DLLFLAGS
     ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
   esac
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -73,21 +73,19 @@
 #ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
 #else
 @BINPATH@/mozcrt19.dll
-#ifndef MOZILLA_1_9_2_BRANCH
 @BINPATH@/mozcpp19.dll
 #endif
 #endif
-#endif
 #ifndef MOZILLA_1_9_2_BRANCH
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #endif
 
 ; Modules
 @BINPATH@/modules/*
 @BINPATH@/modules/activity/*
 @BINPATH@/modules/gloda/*
@@ -571,19 +569,17 @@
 #endif
 @BINPATH@/components/exthandler.xpt
 @BINPATH@/components/exthelper.xpt
 @BINPATH@/components/embed_base.xpt
 @BINPATH@/components/webshell_idls.xpt
 @BINPATH@/components/windowds.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/lwbrk.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
 @BINPATH@/components/nsINIProcessor.js
-#endif
 @BINPATH@/components/nsTryToClose.js
 @BINPATH@/components/pluginGlue.js
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/feeds.xpt
 @BINPATH@/components/saxparser.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/zipwriter.xpt
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -295,21 +295,19 @@ component.reg
 #ifdef XP_WIN
 #ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest
 msvcm80.dll
 msvcp80.dll
 msvcr80.dll
 #else
 mozcrt19.dll
-#ifdef MOZILLA_1_9_2_BRANCH
 mozcpp19.dll
 #endif
 #endif
-#endif
 mozilla-installer-bin
 nsldap32v50.dll
 @DLL_PREFIX@ldap50@DLL_SUFFIX@
 nsldappr32v50.dll
 @DLL_PREFIX@prldap50@DLL_SUFFIX@
 redo-prebinding.sh
 regxpcom.exe
 #ifdef XP_WIN