Bug 558190 - 'Plugin container process name needs to be more appropriate'. r=bsmedberg
authorBen Turner <bent.mozilla@gmail.com>
Fri, 09 Apr 2010 15:40:14 -0700
changeset 40644 b66b7330b505e53d6dbba0e62a76541a3dde4387
parent 40643 0380f3d613e83c1fbc2bc375e652985280923348
child 40645 bd0b0915864b7b8546f8a71d8dc63432ca2fea21
push id12727
push userbturner@mozilla.com
push dateSat, 10 Apr 2010 05:06:46 +0000
treeherdermozilla-central@b66b7330b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs558190
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 558190 - 'Plugin container process name needs to be more appropriate'. r=bsmedberg
browser/installer/Makefile.in
browser/installer/package-manifest.in
browser/installer/removed-files.in
ipc/app/defs.mk
ipc/app/fake/Makefile.in
ipc/app/module.ver
ipc/app/mozilla-runtime.exe.manifest
ipc/app/plugin-container.exe.manifest
ipc/glue/Makefile.in
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -81,16 +81,20 @@ endif
 ifdef NSS_DISABLE_DBM
 DEFINES += -DNSS_DISABLE_DBM=1
 endif
 
 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
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -43,21 +43,21 @@
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @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
 @BINPATH@/mozce_shunt.dll
 #elifdef XP_WIN32
 #ifndef MOZ_MEMORY
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -843,8 +843,9 @@ components/nsUpdateServiceStub.js
 old-homepage-default.properties
 components/microsummaries.xpt
 LICENSE
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 components/libimgicon.so
 #endif
 #endif
+mozilla-runtime@BIN_SUFFIX@
--- a/ipc/app/defs.mk
+++ b/ipc/app/defs.mk
@@ -29,9 +29,9 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-MOZ_CHILD_PROCESS_NAME := mozilla-runtime$(BIN_SUFFIX)
+MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX)
--- a/ipc/app/fake/Makefile.in
+++ b/ipc/app/fake/Makefile.in
@@ -36,11 +36,14 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 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
--- a/ipc/app/module.ver
+++ b/ipc/app/module.ver
@@ -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@
rename from ipc/app/mozilla-runtime.exe.manifest
rename to ipc/app/plugin-container.exe.manifest
--- a/ipc/app/mozilla-runtime.exe.manifest
+++ b/ipc/app/plugin-container.exe.manifest
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
         version="1.0.0.0"
         processorArchitecture="*"
-        name="Mozilla-Runtime"
+        name="plugin-container"
         type="win32"
 />
 <description>Firefox Runtime</description>
 <dependency>
         <dependentAssembly>
                 <assemblyIdentity
                         type="win32"
                         name="Microsoft.Windows.Common-Controls"
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -90,9 +90,14 @@ else
 CPPSRCS += SharedMemory_posix.cpp
 endif
 
 include $(topsrcdir)/ipc/app/defs.mk
 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