Bug 681893 - Add the CRT dlls we don't use to the remove-files lists. Also fix inclusion of the MSVC 10 CRT in the js shell archive. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 29 Aug 2011 07:23:20 +0200
changeset 76269 c37f23b36e54aed1afde621a23efb0dff82d2ff2
parent 76015 ca5a3569462d7b03ba1da27ed161e1d506190912
child 76270 e25c18bf42d22b8e718e4d1c11506e81f822d53c
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewerskhuey
bugs681893
milestone9.0a1
Bug 681893 - Add the CRT dlls we don't use to the remove-files lists. Also fix inclusion of the MSVC 10 CRT in the js shell archive. r=khuey
browser/installer/removed-files.in
mobile/installer/removed-files.in
toolkit/mozapps/installer/packager.mk
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -1267,16 +1267,32 @@ 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
+  #if _MSC_VER != 1400
+    @BINPATH@/Microsoft.VC80.CRT.manifest
+    @BINPATH@/msvcm80.dll
+    @BINPATH@/msvcp80.dll
+    @BINPATH@/msvcr80.dll
+  #endif
+  #if _MSC_VER != 1500
+    @BINPATH@/Microsoft.VC90.CRT.manifest
+    @BINPATH@/msvcm90.dll
+    @BINPATH@/msvcp90.dll
+    @BINPATH@/msvcr90.dll
+  #endif
+  #if _MSC_VER != 1600
+    @BINPATH@/msvcp100.dll
+    @BINPATH@/msvcr100.dll
+  #endif
   mozcrt19.dll
   mozcpp19.dll
 #endif
 @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #ifdef XP_WIN
   components/xpinstal.dll
 #else
--- a/mobile/installer/removed-files.in
+++ b/mobile/installer/removed-files.in
@@ -1,8 +1,24 @@
 README.txt
 #if MOZ_UPDATE_CHANNEL != beta
 extensions/feedback@mobile.mozilla.org.xpi
 #endif
 #ifdef XP_WIN
+  #if _MSC_VER != 1400
+    @BINPATH@/Microsoft.VC80.CRT.manifest
+    @BINPATH@/msvcm80.dll
+    @BINPATH@/msvcp80.dll
+    @BINPATH@/msvcr80.dll
+  #endif
+  #if _MSC_VER != 1500
+    @BINPATH@/Microsoft.VC90.CRT.manifest
+    @BINPATH@/msvcm90.dll
+    @BINPATH@/msvcp90.dll
+    @BINPATH@/msvcr90.dll
+  #endif
+  #if _MSC_VER != 1600
+    @BINPATH@/msvcp100.dll
+    @BINPATH@/msvcr100.dll
+  #endif
   mozcrt19.dll
   mozcpp19.dll
 #endif
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -96,17 +96,17 @@ 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)
+ifeq ($(_MSC_VER),1600)
 JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
 endif
 else
 JSSHELL_BINS += \
   $(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \
   $(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
   $(NULL)
 endif