Bug 687225 - Detect MSVC 2011 compiler. r=ted
authorGregory Szorc <gps@mozilla.com>
Mon, 03 Oct 2011 21:57:00 -0400
changeset 78536 fe2e1060115834c55d9b5d34aa91d5c196ce6fe7
parent 77916 a2762135831ef473ddc590cceaa63c1fffeebab9
child 78537 6e945f23126536783fce6ef618162f48b1491ea9
push id21311
push userkhuey@mozilla.com
push dateTue, 11 Oct 2011 12:20:52 +0000
treeherdermozilla-central@ed4026a18fdb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs687225
milestone10.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 687225 - Detect MSVC 2011 compiler. r=ted
browser/installer/package-manifest.in
browser/installer/removed-files.in
build/win32/Makefile.in
configure.in
js/src/configure.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
@@ -66,16 +66,19 @@
 #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
+#elif _MSC_VER == 1700
+@BINPATH@/msvcp110.dll
+@BINPATH@/msvcr110.dll
 #endif
 
 #endif
 
 [browser]
 ; [Base Browser Files]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -1283,16 +1283,20 @@ xpicleanup@BIN_SUFFIX@
     @BINPATH@/msvcm90.dll
     @BINPATH@/msvcp90.dll
     @BINPATH@/msvcr90.dll
   #endif
   #if _MSC_VER != 1600
     @BINPATH@/msvcp100.dll
     @BINPATH@/msvcr100.dll
   #endif
+  #if _MSC_VER != 1700
+    @BINPATH@/msvcp110.dll
+    @BINPATH@/msvcr110.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/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -66,37 +66,44 @@ MOZ_UTILS_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)
+  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)
+  Microsoft.VC90.CRT.manifest \
+  msvcm90.dll \
+  msvcp90.dll \
+  msvcr90.dll \
+  $(NULL)
 endif
 
 ifeq (1600,$(_MSC_VER))
 REDIST_FILES = \
-	msvcp100.dll \
-	msvcr100.dll \
-	$(NULL)
+  msvcp100.dll \
+  msvcr100.dll \
+  $(NULL)
+endif
+
+ifeq (1700,$(_MSC_VER))
+REDIST_FILES = \
+  msvcp110.dll \
+  msvcr110.dll \
+  $(NULL)
 endif
 
 ifdef REDIST_FILES
 libs::
 	mkdir -p $(FINAL_TARGET)
 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
 endif
 
--- a/configure.in
+++ b/configure.in
@@ -735,16 +735,20 @@ case "$target" in
         elif test "$_CC_MAJOR_VERSION" = "15"; then
             _CC_SUITE=9
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         elif test "$_CC_MAJOR_VERSION" = "16"; then
             _CC_SUITE=10
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
+        elif test "$_CC_MAJOR_VERSION" = "17"; then
+            _CC_SUITE=11
+            AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
+            AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi
 
         _MOZ_RTTI_FLAGS_ON='-GR'
         _MOZ_RTTI_FLAGS_OFF='-GR-'
         _MOZ_EXCEPTIONS_FLAGS_ON='-EHsc'
         _MOZ_EXCEPTIONS_FLAGS_OFF=''
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -737,16 +737,20 @@ case "$target" in
         elif test "$_CC_MAJOR_VERSION" = "15"; then
             _CC_SUITE=9
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         elif test "$_CC_MAJOR_VERSION" = "16"; then
             _CC_SUITE=10
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
+        elif test "$_CC_MAJOR_VERSION" = "17"; then
+            _CC_SUITE=11
+            AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
+            AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi
 
         _MOZ_RTTI_FLAGS_ON='-GR'
         _MOZ_RTTI_FLAGS_OFF='-GR-'
         _MOZ_EXCEPTIONS_FLAGS_ON='-EHsc'
         _MOZ_EXCEPTIONS_FLAGS_OFF=''
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -67,16 +67,19 @@
 #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
+#elif _MSC_VER == 1700
+@BINPATH@/msvcp110.dll
+@BINPATH@/msvcr110.dll
 #endif
 
 #endif
 
 #ifdef ANDROID
 @BINPATH@/AndroidManifest.xml
 @BINPATH@/resources.arsc
 @BINPATH@/classes.dex
--- a/mobile/installer/removed-files.in
+++ b/mobile/installer/removed-files.in
@@ -14,11 +14,15 @@ extensions/feedback@mobile.mozilla.org.x
     @BINPATH@/msvcm90.dll
     @BINPATH@/msvcp90.dll
     @BINPATH@/msvcr90.dll
   #endif
   #if _MSC_VER != 1600
     @BINPATH@/msvcp100.dll
     @BINPATH@/msvcr100.dll
   #endif
+  #if _MSC_VER != 1700
+    @BINPATH@/msvcp110.dll
+    @BINPATH@/msvcr110.dll
+  #endif
   mozcrt19.dll
   mozcpp19.dll
 #endif
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -99,16 +99,19 @@ 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),1600)
 JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
 endif
+ifeq ($(_MSC_VER),1700)
+JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
+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)