author | Myk Melez <myk@mozilla.org> |
Thu, 15 Nov 2012 10:16:08 -0800 | |
changeset 113397 | 577786665c5e839d030b2fa493c60ce7c3763cca |
parent 113396 | 3047a7551911b807dab9452263ddf8e93caba285 |
child 113398 | bbe72fef7e0fa9ef9e1c955fdc7ef916abfabfe4 |
push id | 23870 |
push user | ryanvm@gmail.com |
push date | Fri, 16 Nov 2012 01:21:36 +0000 |
treeherder | mozilla-central@58ebb638a7ea [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 811944 |
milestone | 19.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
|
--- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -33,16 +33,21 @@ JAREXT=.jar else JAREXT= endif DEFINES += -DJAREXT=$(JAREXT) include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) +# Set MSVC dlls version to package, if any. +ifdef WIN32_REDIST_DIR +DEFINES += -DMOZ_MSVC_REDIST=$(_MSC_VER) +endif + ifdef ENABLE_MARIONETTE DEFINES += -DENABLE_MARIONETTE=1 endif ifdef MOZ_PKG_MANIFEST_P MOZ_PKG_MANIFEST = package-manifest endif
--- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -61,34 +61,34 @@ @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 -#if _MSC_VER == 1400 +#ifndef MOZ_DEBUG +#if MOZ_MSVC_REDIST == 1400 @BINPATH@/Microsoft.VC80.CRT.manifest @BINPATH@/msvcm80.dll @BINPATH@/msvcp80.dll @BINPATH@/msvcr80.dll -#elif _MSC_VER == 1500 +#elif MOZ_MSVC_REDIST == 1500 @BINPATH@/Microsoft.VC90.CRT.manifest @BINPATH@/msvcm90.dll @BINPATH@/msvcp90.dll @BINPATH@/msvcr90.dll -#elif _MSC_VER == 1600 +#elif MOZ_MSVC_REDIST == 1600 @BINPATH@/msvcp100.dll @BINPATH@/msvcr100.dll +#elif MOZ_MSVC_REDIST == 1700 +@BINPATH@/msvcp110.dll +@BINPATH@/msvcr110.dll #endif -#else -@BINPATH@/mozcrt19.dll -@BINPATH@/mozcpp19.dll #endif #endif #ifdef MOZ_SHARED_MOZGLUE @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #endif #ifdef ANDROID @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc