Bug 937906 - Remove references to MSVC < 2010 CRT. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 16 Nov 2013 13:38:01 +0900
changeset 154941 48d40e52539c1f4ca546bf055f331e285531f9da
parent 154940 0d7ca6b6eb8d3ad3a6d9a7e0d6b9b12b4eb4ddae
child 154942 2cce56b9ca0cb9aa7e11112e024df8cb5f790068
push id36176
push usermh@glandium.org
push dateSat, 16 Nov 2013 04:42:22 +0000
treeherdermozilla-inbound@7bead59330cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs937906
milestone28.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 937906 - Remove references to MSVC < 2010 CRT. r=mshal Also add missing msvc 2013 CRT to b2g package manifest.
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
build/win32/Makefile.in
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -65,32 +65,25 @@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
 #ifndef MOZ_DEBUG
-#if MOZ_MSVC_REDIST == 1400
-@BINPATH@/Microsoft.VC80.CRT.manifest
-@BINPATH@/msvcm80.dll
-@BINPATH@/msvcp80.dll
-@BINPATH@/msvcr80.dll
-#elif MOZ_MSVC_REDIST == 1500
-@BINPATH@/Microsoft.VC90.CRT.manifest
-@BINPATH@/msvcm90.dll
-@BINPATH@/msvcp90.dll
-@BINPATH@/msvcr90.dll
-#elif MOZ_MSVC_REDIST == 1600
+#if MOZ_MSVC_REDIST == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #elif MOZ_MSVC_REDIST == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
+#elif MOZ_MSVC_REDIST == 1800
+@BINPATH@/msvcp120.dll
+@BINPATH@/msvcr120.dll
 #endif
 #endif
 #endif
 #ifdef MOZ_SHARED_MOZGLUE
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
 #ifdef ANDROID
 @BINPATH@/AndroidManifest.xml
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -78,27 +78,17 @@
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #ifndef MOZ_DEBUG
-#if MOZ_MSVC_REDIST == 1400
-@BINPATH@/Microsoft.VC80.CRT.manifest
-@BINPATH@/msvcm80.dll
-@BINPATH@/msvcp80.dll
-@BINPATH@/msvcr80.dll
-#elif MOZ_MSVC_REDIST == 1500
-@BINPATH@/Microsoft.VC90.CRT.manifest
-@BINPATH@/msvcm90.dll
-@BINPATH@/msvcp90.dll
-@BINPATH@/msvcr90.dll
-#elif MOZ_MSVC_REDIST == 1600
+#if MOZ_MSVC_REDIST == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #elif MOZ_MSVC_REDIST == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
 #ifdef MOZ_METRO
 @BINPATH@/vccorlib110.dll
 #endif
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -12,34 +12,16 @@ endif # ENABLE_TESTS
 
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef WIN32_REDIST_DIR
 ifndef MOZ_DEBUG
 
-ifeq (1400,$(_MSC_VER))
-REDIST_FILES = \
-  Microsoft.VC80.CRT.manifest \
-  msvcm80.dll \
-  msvcp80.dll \
-  msvcr80.dll \
-  $(NULL)
-endif
-
-ifeq (1500,$(_MSC_VER))
-REDIST_FILES = \
-  Microsoft.VC90.CRT.manifest \
-  msvcm90.dll \
-  msvcp90.dll \
-  msvcr90.dll \
-  $(NULL)
-endif
-
 ifeq (1600,$(_MSC_VER))
 REDIST_FILES = \
   msvcp100.dll \
   msvcr100.dll \
   $(NULL)
 endif
 
 ifeq (1700,$(_MSC_VER))