--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -81,20 +81,16 @@ 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@/@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
@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,9 +843,8 @@ 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 := plugin-container$(BIN_SUFFIX)
+MOZ_CHILD_PROCESS_NAME := mozilla-runtime$(BIN_SUFFIX)
--- a/ipc/app/fake/Makefile.in
+++ b/ipc/app/fake/Makefile.in
@@ -36,14 +36,11 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
--- 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@
new file mode 100644
--- /dev/null
+++ b/ipc/app/mozilla-runtime.exe.manifest
@@ -0,0 +1,31 @@
+<?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"
+ type="win32"
+/>
+<description>Firefox Runtime</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+ <ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
+ <ms_asmv3:security>
+ <ms_asmv3:requestedPrivileges>
+ <ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false">
+ </ms_asmv3:requestedExecutionLevel>
+ </ms_asmv3:requestedPrivileges>
+ </ms_asmv3:security>
+ </ms_asmv3:trustInfo>
+</assembly>
+
deleted file mode 100644
--- a/ipc/app/plugin-container.exe.manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="plugin-container"
- type="win32"
-/>
-<description>Firefox Runtime</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
- <ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
- <ms_asmv3:security>
- <ms_asmv3:requestedPrivileges>
- <ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false">
- </ms_asmv3:requestedExecutionLevel>
- </ms_asmv3:requestedPrivileges>
- </ms_asmv3:security>
- </ms_asmv3:trustInfo>
-</assembly>
-
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -90,14 +90,9 @@ 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