author | Serge Gautherie <sgautherie.bz@free.fr> |
Tue, 20 Mar 2012 03:05:20 +0100 | |
changeset 90608 | 92fe907ddac8855e733102813db5e860fd7a557a |
parent 90607 | ff3521bc655946ec545b49bc64bc7167de8ee709 |
child 90609 | 432c4be058b529289e2e8fc60468250b2ae47a6f |
push id | 22367 |
push user | sgautherie.bz@free.fr |
push date | Thu, 29 Mar 2012 18:15:52 +0000 |
treeherder | mozilla-central@92fe907ddac8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 735810 |
milestone | 14.0a1 |
first release with | nightly linux32
92fe907ddac8
/
14.0a1
/
20120330031146
/
files
nightly linux64
92fe907ddac8
/
14.0a1
/
20120330031146
/
files
nightly mac
92fe907ddac8
/
14.0a1
/
20120330031146
/
files
nightly win32
92fe907ddac8
/
14.0a1
/
20120330031146
/
files
nightly win64
92fe907ddac8
/
14.0a1
/
20120330031146
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
14.0a1
/
20120330031146
/
pushlog to previous
nightly linux64
14.0a1
/
20120330031146
/
pushlog to previous
nightly mac
14.0a1
/
20120330031146
/
pushlog to previous
nightly win32
14.0a1
/
20120330031146
/
pushlog to previous
nightly win64
14.0a1
/
20120330031146
/
pushlog to previous
|
--- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -89,16 +89,21 @@ ifdef MOZ_ANGLE DEFINES += -DMOZ_ANGLE=$(MOZ_ANGLE) DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif 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 + ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL))) DEFINES += -DSHIP_FEEDBACK=1 endif ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) DEFINES += -DMOZ_SHARED_MOZGLUE=1 endif
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -65,30 +65,30 @@ #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@ #else @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ #endif #ifdef XP_WIN32 #ifndef MOZ_DEBUG -#if _MSC_VER == 1400 +#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 _MSC_VER == 1700 +#elif MOZ_MSVC_REDIST == 1700 @BINPATH@/msvcp110.dll @BINPATH@/msvcr110.dll #endif #endif #endif [browser] ; [Base Browser Files]
--- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -1347,39 +1347,39 @@ xpicleanup@BIN_SUFFIX@ #ifndef XP_WIN 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 + mozcpp19.dll + mozcrt19.dll + #if MOZ_MSVC_REDIST != 1400 Microsoft.VC80.CRT.manifest msvcm80.dll msvcp80.dll msvcr80.dll #endif - #if _MSC_VER != 1500 + #if MOZ_MSVC_REDIST != 1500 Microsoft.VC90.CRT.manifest msvcm90.dll msvcp90.dll msvcr90.dll #endif - #if _MSC_VER != 1600 + #if MOZ_MSVC_REDIST != 1600 msvcp100.dll msvcr100.dll #endif - #if _MSC_VER != 1700 + #if MOZ_MSVC_REDIST != 1700 msvcp110.dll msvcr110.dll #endif - mozcrt19.dll - mozcpp19.dll + plugins/npnul32.dll #endif @DLL_PREFIX@xpcom_core@DLL_SUFFIX@ components/@DLL_PREFIX@jar50@DLL_SUFFIX@ #ifdef XP_WIN components/xpinstal.dll #else components/@DLL_PREFIX@jsd@DLL_SUFFIX@ components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@