wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 735810. (Cv3) Stop trying to package MSVC dlls when WIN32_REDIST_DIR isn't set. r=(khuey, ted.mielczarek).

Browse Source
This commit is contained in:
Serge Gautherie 2012-03-20 03:05:20 +01:00
parent 27535f6d0a
commit 723bc47ce6
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/installer/Makefile.in
View File

@ -94,6 +94,11 @@ endif
include $(topsrcdir)/ipc/app/defs.mk include $(topsrcdir)/ipc/app/defs.mk
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) 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))) ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
DEFINES += -DSHIP_FEEDBACK=1 DEFINES += -DSHIP_FEEDBACK=1
endif endif

8
browser/installer/package-manifest.in
View File

@ -70,20 +70,20 @@
#endif #endif
#ifdef XP_WIN32 #ifdef XP_WIN32
#ifndef MOZ_DEBUG #ifndef MOZ_DEBUG
#if _MSC_VER == 1400 #if MOZ_MSVC_REDIST == 1400
@BINPATH@/Microsoft.VC80.CRT.manifest @BINPATH@/Microsoft.VC80.CRT.manifest
@BINPATH@/msvcm80.dll @BINPATH@/msvcm80.dll
@BINPATH@/msvcp80.dll @BINPATH@/msvcp80.dll
@BINPATH@/msvcr80.dll @BINPATH@/msvcr80.dll
#elif _MSC_VER == 1500 #elif MOZ_MSVC_REDIST == 1500
@BINPATH@/Microsoft.VC90.CRT.manifest @BINPATH@/Microsoft.VC90.CRT.manifest
@BINPATH@/msvcm90.dll @BINPATH@/msvcm90.dll
@BINPATH@/msvcp90.dll @BINPATH@/msvcp90.dll
@BINPATH@/msvcr90.dll @BINPATH@/msvcr90.dll
#elif _MSC_VER == 1600 #elif MOZ_MSVC_REDIST == 1600
@BINPATH@/msvcp100.dll @BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll @BINPATH@/msvcr100.dll
#elif _MSC_VER == 1700 #elif MOZ_MSVC_REDIST == 1700
@BINPATH@/msvcp110.dll @BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll @BINPATH@/msvcr110.dll
#endif #endif

14
browser/installer/removed-files.in
View File

@ -1352,29 +1352,29 @@ xpicleanup@BIN_SUFFIX@
components/jsd3250.dll components/jsd3250.dll
components/nsPostUpdateWin.js components/nsPostUpdateWin.js
js3250.dll js3250.dll
plugins/npnul32.dll mozcpp19.dll
#if _MSC_VER != 1400 mozcrt19.dll
#if MOZ_MSVC_REDIST != 1400
Microsoft.VC80.CRT.manifest Microsoft.VC80.CRT.manifest
msvcm80.dll msvcm80.dll
msvcp80.dll msvcp80.dll
msvcr80.dll msvcr80.dll
#endif #endif
#if _MSC_VER != 1500 #if MOZ_MSVC_REDIST != 1500
Microsoft.VC90.CRT.manifest Microsoft.VC90.CRT.manifest
msvcm90.dll msvcm90.dll
msvcp90.dll msvcp90.dll
msvcr90.dll msvcr90.dll
#endif #endif
#if _MSC_VER != 1600 #if MOZ_MSVC_REDIST != 1600
msvcp100.dll msvcp100.dll
msvcr100.dll msvcr100.dll
#endif #endif
#if _MSC_VER != 1700 #if MOZ_MSVC_REDIST != 1700
msvcp110.dll msvcp110.dll
msvcr110.dll msvcr110.dll
#endif #endif
mozcrt19.dll plugins/npnul32.dll
mozcpp19.dll
#endif #endif
@DLL_PREFIX@xpcom_core@DLL_SUFFIX@ @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
components/@DLL_PREFIX@jar50@DLL_SUFFIX@ components/@DLL_PREFIX@jar50@DLL_SUFFIX@