Bug 558190 - 'Plugin container process name needs to be more appropriate'. r=bsmedberg

--HG--
rename : ipc/app/mozilla-runtime.exe.manifest => ipc/app/plugin-container.exe.manifest
This commit is contained in:
Ben Turner 2010-04-09 15:40:14 -07:00
parent 8a0f14194b
commit 57ca71f5eb
8 changed files with 19 additions and 6 deletions

View File

@ -86,6 +86,10 @@ ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
# Don't ifdef MOZ_IPC this because mac ppc needs it too.
include $(topsrcdir)/ipc/app/defs.mk
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest

View File

@ -48,11 +48,11 @@
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
#ifdef XP_MACOSX
@BINPATH@/XUL
@BINPATH@/mozilla-runtime@BIN_SUFFIX@
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
#else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#ifdef MOZ_IPC
@BINPATH@/mozilla-runtime@BIN_SUFFIX@
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
#endif
#endif
#ifdef WINCE

View File

@ -848,3 +848,4 @@ LICENSE
components/libimgicon.so
#endif
#endif
mozilla-runtime@BIN_SUFFIX@

View File

@ -34,4 +34,4 @@
#
# ***** END LICENSE BLOCK *****
MOZ_CHILD_PROCESS_NAME := mozilla-runtime$(BIN_SUFFIX)
MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX)

View File

@ -41,6 +41,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
SIMPLE_PROGRAMS = mozilla-runtime
include $(topsrcdir)/ipc/app/defs.mk
PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
CPPSRCS = mozilla-runtime.cpp
include $(topsrcdir)/config/rules.mk

View File

@ -1,6 +1,6 @@
WIN32_MODULE_COMPANYNAME=Mozilla Corporation
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_DESCRIPTION=Plugin Helper for @MOZ_APP_DISPLAYNAME@
WIN32_MODULE_DESCRIPTION=Plugin Container for @MOZ_APP_DISPLAYNAME@
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

View File

@ -3,7 +3,7 @@
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="Mozilla-Runtime"
name="plugin-container"
type="win32"
/>
<description>Firefox Runtime</description>

View File

@ -95,4 +95,9 @@ DEFINES += -DMOZ_CHILD_PROCESS_NAME="\"$(MOZ_CHILD_PROCESS_NAME)\""
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
# Since we get the value of MOZ_CHILD_PROCESS_NAME from another file make sure
# to rebuild if that file changes.
$(CPPSRCS:%.cpp=%.$(OBJ_SUFFIX)): $(topsrcdir)/ipc/app/defs.mk