From 7646c9d84c6ed86f6d6749cb0b0af3c37d82c701 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Fri, 9 Apr 2010 20:57:30 -0700
Subject: [PATCH] Backed out changeset 25879ce33e7a

---
 browser/installer/Makefile.in                                | 4 ----
 browser/installer/package-manifest.in                        | 4 ++--
 browser/installer/removed-files.in                           | 1 -
 ipc/app/defs.mk                                              | 2 +-
 ipc/app/fake/Makefile.in                                     | 5 +----
 ipc/app/module.ver                                           | 2 +-
 ...n-container.exe.manifest => mozilla-runtime.exe.manifest} | 2 +-
 ipc/glue/Makefile.in                                         | 5 -----
 8 files changed, 6 insertions(+), 19 deletions(-)
 rename ipc/app/{plugin-container.exe.manifest => mozilla-runtime.exe.manifest} (97%)

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index eec372bd610..29ea17e5ec4 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -86,10 +86,6 @@ 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
 
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index aa4a5eaa4ff..a401ad539a4 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -48,11 +48,11 @@
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
-@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
+@BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #ifdef MOZ_IPC
-@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
+@BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #endif
 #endif
 #ifdef WINCE
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 5e3fe5674c1..c3ae93acfbd 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -848,4 +848,3 @@ LICENSE
 components/libimgicon.so
 #endif
 #endif
-mozilla-runtime@BIN_SUFFIX@
diff --git a/ipc/app/defs.mk b/ipc/app/defs.mk
index bf6c5d4429a..67dd584debd 100644
--- a/ipc/app/defs.mk
+++ b/ipc/app/defs.mk
@@ -34,4 +34,4 @@
 #
 # ***** END LICENSE BLOCK *****
 
-MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX)
+MOZ_CHILD_PROCESS_NAME := mozilla-runtime$(BIN_SUFFIX)
diff --git a/ipc/app/fake/Makefile.in b/ipc/app/fake/Makefile.in
index 00f206e4557..631703a4248 100644
--- a/ipc/app/fake/Makefile.in
+++ b/ipc/app/fake/Makefile.in
@@ -41,9 +41,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/ipc/app/defs.mk
-
-PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
-CPPSRCS = mozilla-runtime.cpp
+SIMPLE_PROGRAMS	= mozilla-runtime
 
 include $(topsrcdir)/config/rules.mk
diff --git a/ipc/app/module.ver b/ipc/app/module.ver
index 8abbd23f0ea..579aa5d68a4 100644
--- 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 Container for @MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_DESCRIPTION=Plugin Helper for @MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
diff --git a/ipc/app/plugin-container.exe.manifest b/ipc/app/mozilla-runtime.exe.manifest
similarity index 97%
rename from ipc/app/plugin-container.exe.manifest
rename to ipc/app/mozilla-runtime.exe.manifest
index 0bb15da0dbb..dc40f06c732 100644
--- a/ipc/app/plugin-container.exe.manifest
+++ b/ipc/app/mozilla-runtime.exe.manifest
@@ -3,7 +3,7 @@
 <assemblyIdentity
         version="1.0.0.0"
         processorArchitecture="*"
-        name="plugin-container"
+        name="Mozilla-Runtime"
         type="win32"
 />
 <description>Firefox Runtime</description>
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
index b89d298b98f..fc7cea2248b 100644
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -95,9 +95,4 @@ 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