Bug 659940 - Remove MOZ_IPC checks from comm-central since IPC is always built now rs=standard8
authorIan Neal <iann_cvs@blueyonder.co.uk>
Fri, 03 Jun 2011 21:48:58 +0100
changeset 8100 2367dffaa3cb381c816c5bc56f32204bc0965ee7
parent 8099 78cbb0581f0fef8c2d9cef5d82e12ca786730776
child 8101 0981a6b6bdaa8527d3d045b049f24e8aecab0b3f
push id84
push userbugzilla@standard8.plus.com
push dateTue, 16 Aug 2011 21:25:04 +0000
treeherdercomm-beta@6970c86be3cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8
bugs659940
Bug 659940 - Remove MOZ_IPC checks from comm-central since IPC is always built now rs=standard8
mail/app/profile/all-thunderbird.js
mail/installer/Makefile.in
mail/installer/package-manifest.in
mail/test/xpcshell.ini
suite/browser/browser-prefs.js
suite/installer/Makefile.in
suite/installer/package-manifest.in
suite/test/xpcshell.ini
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -673,20 +673,18 @@ pref("browser.urlbar.restrict.openpage",
 #ifdef XP_MACOSX
 // i386 ipc preferences
 pref("dom.ipc.plugins.enabled.i386", false);
 pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaappletplugin.plugin", true);
 // x86_64 ipc preferences
 pref("dom.ipc.plugins.enabled.x86_64", true);
-#elifdef MOZ_IPC
+#else
 pref("dom.ipc.plugins.enabled", true);
-#else
-pref("dom.ipc.plugins.enabled", false);
 #endif
 
 // This pref governs whether we attempt to work around problems caused by
 // plugins using OS calls to manipulate the cursor while running out-of-
 // process.  These workarounds all involve intercepting (hooking) certain
 // OS calls in the plugin process, then arranging to make certain OS calls
 // in the browser process.  Eventually plugins will be required to use the
 // NPAPI to manipulate the cursor, and these workarounds will be removed.
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -81,20 +81,18 @@ DEFINES += -DMOZ_ANGLE=$(MOZ_ANGLE)
 DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
-ifdef MOZ_IPC
 include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
-endif
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -65,24 +65,22 @@
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
-#ifdef MOZ_IPC
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#endif
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DX9_DLL@
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
 
@@ -140,38 +138,34 @@
 @BINPATH@/components/aboutRedirector.js
 @BINPATH@/components/activity.xpt
 @BINPATH@/components/activityComponents.manifest
 @BINPATH@/components/addrbook.xpt
 @BINPATH@/components/fts3tok.xpt
 ; interfaces.manifest doesn't get packaged because it is dynamically
 ; re-created at packaging time when linking the xpts that will actually
 ; go into the package, so the test related interfaces aren't included.
-#ifdef MOZ_IPC
 @BINPATH@/components/jetpack.xpt
-#endif
 @BINPATH@/components/mime.xpt
 @BINPATH@/components/steel.xpt
 @BINPATH@/components/msgAsyncPrompter.js
 @BINPATH@/components/msgbase.xpt
 @BINPATH@/components/msgBase.manifest
 @BINPATH@/components/msgcompose.xpt
 @BINPATH@/components/msgdb.xpt
 @BINPATH@/components/msgimap.xpt
 @BINPATH@/components/msglocal.xpt
 @BINPATH@/components/msgnews.xpt
 @BINPATH@/components/msgsearch.xpt
 @BINPATH@/components/import.xpt
 @BINPATH@/components/impComm4xMail.xpt
 @BINPATH@/components/mailview.xpt
 @BINPATH@/components/mailprofilemigration.xpt
-#ifdef MOZ_IPC
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
-#endif
 @BINPATH@/components/nsActivity.js
 @BINPATH@/components/nsActivityManager.js
 @BINPATH@/components/nsActivityManagerUI.js
 @BINPATH@/components/nsAddrbook.manifest
 @BINPATH@/components/nsMailNewsCommandLineHandler.js
 @BINPATH@/components/services-crypto-component.xpt
 #ifndef XP_OS2
 @BINPATH@/components/shellservice.xpt
--- a/mail/test/xpcshell.ini
+++ b/mail/test/xpcshell.ini
@@ -110,30 +110,15 @@ skip-if.toolkit = windows cocoa os2
 
 [include:mozilla/toolkit/components/commandlines/test/unit_win/xpcshell.ini]
 run-if.os = windows
 
 [include:mozilla/toolkit/components/commandlines/test/unit_unix/xpcshell.ini]
 skip-if.os = windows mac os2
 
 [include:mozilla/chrome/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/extensions/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/ipc/testshell/tests/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/modules/libpref/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/netwerk/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/netwerk/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/toolkit/components/contentprefs/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/uriloader/exthandler/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -679,20 +679,18 @@ pref("dom.event.contextmenu.enabled",  t
 #ifdef XP_MACOSX
 // i386 IPC preferences
 pref("dom.ipc.plugins.enabled.i386", false);
 pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaappletplugin.plugin", true);
 // x86_64 ipc preferences
 pref("dom.ipc.plugins.enabled.x86_64", true);
-#elifdef MOZ_IPC
+#else
 pref("dom.ipc.plugins.enabled", true);
-#else
-pref("dom.ipc.plugins.enabled", false);
 #endif
 
 // plugin finder service url
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
 pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
 pref("plugins.update.notifyUser", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -122,17 +122,16 @@ endif
 ifneq (en-US, $(AB_CD))
 DEFINES += -DLOCALE_BUILD=1
 endif
 
 ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 DEFINES += -DWIN_OR_OS2=1
 endif
 
-# Don't ifdef MOZ_IPC this because mac ppc needs it too.
 include $(MOZILLA_SRCDIR)/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) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -51,23 +51,21 @@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
-#ifdef MOZ_IPC
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#endif
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DX9_DLL@
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
 #ifdef XP_WIN32
@@ -321,20 +319,18 @@
 @BINPATH@/components/FeedProcessor.js
 @BINPATH@/components/FeedProcessor.manifest
 @BINPATH@/components/FeedWriter.js
 @BINPATH@/components/GPSDGeolocationProvider.js
 @BINPATH@/components/GPSDGeolocationProvider.manifest
 @BINPATH@/components/jsconsole-clhandler.js
 @BINPATH@/components/jsconsole-clhandler.manifest
 ; This is not used yet, so don't package it at all
-;#ifdef MOZ_IPC
 ;@BINPATH@/components/messageWakeupService.js
 ;@BINPATH@/components/messageWakeupService.manifest
-;#endif
 @BINPATH@/components/NetworkGeolocationProvider.js
 @BINPATH@/components/NetworkGeolocationProvider.manifest
 @BINPATH@/components/nsAbout.js
 @BINPATH@/components/nsAboutCertError.js
 @BINPATH@/components/nsAboutData.js
 @BINPATH@/components/nsAboutFeeds.js
 @BINPATH@/components/nsAboutLife.js
 @BINPATH@/components/nsAboutRights.js
--- a/suite/test/xpcshell.ini
+++ b/suite/test/xpcshell.ini
@@ -103,30 +103,15 @@ skip-if.toolkit = windows cocoa os2
 
 [include:mozilla/toolkit/components/commandlines/test/unit_win/xpcshell.ini]
 run-if.os = windows
 
 [include:mozilla/toolkit/components/commandlines/test/unit_unix/xpcshell.ini]
 skip-if.os = windows mac os2
 
 [include:mozilla/chrome/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/extensions/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/ipc/testshell/tests/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/modules/libpref/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/netwerk/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/netwerk/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/toolkit/components/contentprefs/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:mozilla/uriloader/exthandler/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc