Bug 770896 - include vccorlib110 redist library in installs for metro. r=rstrong
authorJim Mathies <jmathies@mozilla.com>
Mon, 09 Jul 2012 15:48:29 -0500
changeset 98730 e308e75d1b5bbcf7fc11b18e320edfe2e0536b35
parent 98729 727439019fa71718ef644372a580c9d6d4b806ed
child 98731 e587293c649722ba2bab0ab26688c4f7d63d32a3
push id11627
push userjmathies@mozilla.com
push dateMon, 09 Jul 2012 20:48:45 +0000
treeherdermozilla-inbound@e308e75d1b5b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs770896
milestone16.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 770896 - include vccorlib110 redist library in installs for metro. r=rstrong
browser/installer/package-manifest.in
browser/installer/removed-files.in
build/win32/Makefile.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -90,16 +90,19 @@
 @BINPATH@/msvcp90.dll
 @BINPATH@/msvcr90.dll
 #elif 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
 #endif
 #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
@@ -1383,16 +1383,19 @@ xpicleanup@BIN_SUFFIX@
   #endif
   #if MOZ_MSVC_REDIST != 1600
     msvcp100.dll
     msvcr100.dll
   #endif
   #if MOZ_MSVC_REDIST != 1700
     msvcp110.dll
     msvcr110.dll
+    #ifdef MOZ_METRO
+      vccorlib110.dll
+    #endif
   #endif
   plugins/npnul32.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
@@ -63,16 +63,20 @@ endif
 
 ifeq (1700,$(_MSC_VER))
 REDIST_FILES = \
   msvcp110.dll \
   msvcr110.dll \
   $(NULL)
 endif
 
+ifdef MOZ_METRO
+REDIST_FILES += vccorlib110.dll
+endif
+
 ifdef REDIST_FILES
 libs-preqs = \
   $(call mkdir_deps,$(FINAL_TARGET)) \
   $(NULL)
 
 libs:: $(libs-preqs)
 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
 endif