Bug 678161 - Also install msvc*.dll when using new style jemalloc. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 23 Aug 2011 15:36:31 +0200
changeset 75805 9b6e97e91525e9e146e73ce698684c9f6cc41209
parent 75804 00c7432d78839e715a97824f8d0f8b80697c6c08
child 75806 011569fdc55597714e413d17d25e1ca801ac9a11
push id21059
push userkhuey@mozilla.com
push dateWed, 24 Aug 2011 15:15:17 +0000
treeherdermozilla-central@d3e15e7073f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs678161
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 678161 - Also install msvc*.dll when using new style jemalloc. r=khuey
browser/installer/package-manifest.in
browser/installer/removed-files.in
build/win32/Makefile.in
mobile/installer/Makefile.in
mobile/installer/package-manifest.in
mobile/installer/removed-files.in
toolkit/mozapps/installer/packager.mk
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -55,39 +55,38 @@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
-#ifdef MOZ_MEMORY
 #ifdef WIN32_OLD_STYLE_JEMALLOC
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
 #else
+#ifdef MOZ_MEMORY
 @BINPATH@/jemalloc.dll
 #endif
-#endif
-#else
 #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
 @BINPATH@/msvcp90.dll
 @BINPATH@/msvcr90.dll
 #elif _MSC_VER == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #endif
+#endif
 
 #endif
 
 [browser]
 ; [Base Browser Files]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -1267,23 +1267,24 @@ xpicleanup@BIN_SUFFIX@
   res/fonts/mathfontSymbol.properties
 #endif
 #ifdef XP_WIN
   components/brwsrcmp.dll
   components/jsd3250.dll
   components/nsPostUpdateWin.js
   js3250.dll
   plugins/npnul32.dll
-  #ifdef MOZ_MEMORY
+  #ifdef WIN32_OLD_STYLE_JEMALLOC
     Microsoft.VC80.CRT.manifest
     msvcm80.dll
     msvcp80.dll
     msvcr80.dll
   #else
     mozcrt19.dll
+    mozcpp19.dll
   #endif
 #endif
 @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #ifdef XP_WIN
   components/xpinstal.dll
 #else
   components/@DLL_PREFIX@jsd@DLL_SUFFIX@
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -59,17 +59,17 @@ DIRS += \
 PROGRAM = crashinject$(BIN_SUFFIX)
 USE_STATIC_LIBS = 1
 CPPSRCS = crashinject.cpp
 
 endif # ENABLE_TESTS
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MEMORY
+ifndef WIN32_OLD_STYLE_JEMALLOC
 ifdef WIN32_REDIST_DIR
 ifndef MOZ_DEBUG
 
 ifeq (1400,$(_MSC_VER))
 REDIST_FILES = \
 	Microsoft.VC80.CRT.manifest \
 	msvcm80.dll \
 	msvcp80.dll \
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -73,16 +73,20 @@ JAREXT=.jar
 else
 JAREXT=
 endif
 DEFINES += -DJAREXT=$(JAREXT)
 
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
+ifdef WIN32_OLD_STYLE_JEMALLOC
+DEFINES += -DWIN32_OLD_STYLE_JEMALLOC=1
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 endif
 
 MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec sed -i '/^\#/d' {} \;
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -53,36 +53,41 @@
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
-#ifndef MOZ_MEMORY
+#ifdef WIN32_OLD_STYLE_JEMALLOC
+@BINPATH@/mozcrt19.dll
+@BINPATH@/mozcpp19.dll
+#else
+#ifdef MOZ_MEMORY
+@BINPATH@/jemalloc.dll
+#endif
 #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
 @BINPATH@/msvcp90.dll
 @BINPATH@/msvcr90.dll
 #elif _MSC_VER == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #endif
-#else
-@BINPATH@/mozcrt19.dll
-@BINPATH@/mozcpp19.dll
 #endif
+
 #endif
+
 #ifdef ANDROID
 @BINPATH@/AndroidManifest.xml
 @BINPATH@/resources.arsc
 @BINPATH@/classes.dex
 @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
 @BINPATH@/res/drawable
 @BINPATH@/res/drawable-hdpi
 @BINPATH@/res/layout
--- a/mobile/installer/removed-files.in
+++ b/mobile/installer/removed-files.in
@@ -1,4 +1,15 @@
 README.txt
 #if MOZ_UPDATE_CHANNEL != beta
 extensions/feedback@mobile.mozilla.org.xpi
 #endif
+#ifdef XP_WIN
+  #ifdef WIN32_OLD_STYLE_JEMALLOC
+    Microsoft.VC80.CRT.manifest
+    msvcm80.dll
+    msvcp80.dll
+    msvcr80.dll
+  #else
+    mozcrt19.dll
+    mozcpp19.dll
+  #endif
+#endif
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -85,18 +85,35 @@ SDK           = $(SDK_PATH)$(PKG_BASENAM
 # JavaScript Shell packaging
 ifndef LIBXUL_SDK
 JSSHELL_BINS  = \
   $(DIST)/bin/js$(BIN_SUFFIX) \
   $(NULL)
 ifndef MOZ_NATIVE_NSPR
 JSSHELL_BINS += $(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX)
 ifeq ($(OS_ARCH),WINNT)
+ifdef WIN32_OLD_STYLE_JEMALLOC
 JSSHELL_BINS += $(DIST)/bin/mozcrt19$(DLL_SUFFIX)
 else
+ifdef MOZ_MEMORY
+JSSHELL_BINS += $(DIST)/bin/jemalloc$(DLL_SUFFIX)
+endif
+ifeq ($(_MSC_VER),1400)
+JSSHELL_BINS += $(DIST)/bin/Microsoft.VC80.CRT.manifest
+JSSHELL_BINS += $(DIST)/bin/msvcr80.dll
+endif
+ifeq ($(_MSC_VER),1500)
+JSSHELL_BINS += $(DIST)/bin/Microsoft.VC90.CRT.manifest
+JSSHELL_BINS += $(DIST)/bin/msvcr90.dll
+endif
+ifeq ($(_MSC_VER),1500)
+JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
+endif
+endif
+else
 JSSHELL_BINS += \
   $(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \
   $(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
   $(NULL)
 endif
 endif # MOZ_NATIVE_NSPR
 MAKE_JSSHELL  = $(ZIP) -9j $(PKG_JSSHELL) $(JSSHELL_BINS)
 endif # LIBXUL_SDK