Bug 647118 - Remove support for --disable-plugins. r=glandium
authorMitchell Field <mitchell.field@live.com.au>
Sat, 02 Apr 2011 01:41:46 +1100
changeset 64578 8d3f6093c42502338f16aec5ec68e1f5a0f672a2
parent 64577 373dd35f5f33bcb2e1b7e17ab6fe6828c09172be
child 64603 a5f0d6dc05234ee78a545dae8aad4c5524eec8a0
child 67765 5f926a6429fc8e57ad1f7e7b4e657c5a0a3b6d96
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs647118
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 647118 - Remove support for --disable-plugins. r=glandium
config/autoconf.mk.in
configure.in
modules/plugin/Makefile.in
modules/plugin/base/public/Makefile.in
testing/mochitest/Makefile.in
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/extensions/extensions.manifest
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -219,18 +219,16 @@ MOZ_TIMELINE=@MOZ_TIMELINE@
 
 ENABLE_STRIP	= @ENABLE_STRIP@
 PKG_SKIP_STRIP	= @PKG_SKIP_STRIP@
 
 ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
-MOZ_PLUGINS	= @MOZ_PLUGINS@
-
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
 MOZ_XUL                    = @MOZ_XUL@
 MOZ_RDF                    = @MOZ_RDF@
 
--- a/configure.in
+++ b/configure.in
@@ -4977,17 +4977,16 @@ VPX_ARM_ASM=
 MOZ_LIBJPEG_TURBO=1
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 LIBJPEG_TURBO_X86_ASM=
 LIBJPEG_TURBO_X64_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
-MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_FASTSTART=
 MOZ_HELP_VIEWER=
@@ -5849,24 +5848,16 @@ MOZ_ARG_ENABLE_BOOL(ipdl-tests,
 
 if test -n "$MOZ_IPDL_TESTS"; then
     AC_DEFINE(MOZ_IPDL_TESTS)
 fi
 
 AC_SUBST(MOZ_IPDL_TESTS)
 
 dnl ========================================================
-dnl = Disable plugin support
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(plugins,
-[  --disable-plugins       Disable plugins support],
-    MOZ_PLUGINS=,
-    MOZ_PLUGINS=1)
-
-dnl ========================================================
 dnl = Disable building dbm
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(dbm,
 [  --disable-dbm           Disable building dbm],
     NSS_DISABLE_DBM=1,
     NSS_DISABLE_DBM=)
 
 dnl bi-directional support always on
@@ -9053,17 +9044,16 @@ AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_EXTENSIONS)
 AC_SUBST(MOZ_JSDEBUGGER)
-AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_LEAKY)
 AC_SUBST(MOZ_JPROF)
 AC_SUBST(MOZ_SHARK)
 AC_SUBST(MOZ_CALLGRIND)
 AC_SUBST(MOZ_VTUNE)
 AC_SUBST(MOZ_PROFILING)
 AC_SUBST(MOZ_USE_NATIVE_UCONV)
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -30,42 +30,37 @@
 # 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 *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= plugin
+MODULE = plugin
 
-DIRS		= base/public 
-
-ifdef MOZ_PLUGINS
-DIRS		+= base/src 
+DIRS = \
+  base/public \
+  base/src \
+  $(NULL)
 
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 
 ifdef ENABLE_TESTS
 ifneq (,$(filter WINNT Darwin Linux OS2 SunOS,$(OS_ARCH)))
 DIRS += test
 endif
 endif
 
-endif # MOZ_PLUGINS
-
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_PLUGINS
 $(DIST)/bin/plugins:
 	$(NSINSTALL) -D $@
 
 export:: $(DIST)/bin/plugins
-
-endif
--- a/modules/plugin/base/public/Makefile.in
+++ b/modules/plugin/base/public/Makefile.in
@@ -30,54 +30,48 @@
 # 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 *****
 
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= plugin
-GRE_MODULE	= 1
+MODULE = plugin
+GRE_MODULE = 1
 
-EXPORTS		= \
-		nsPluginLogging.h \
-		nsPluginError.h \
-		nsPluginNativeWindow.h \
-		nsPluginsCID.h \
-		$(NULL)
-
-SDK_HEADERS	 = \
-		npapi.h \
-		npfunctions.h \
-		nptypes.h \
-		npruntime.h \
-		$(NULL)
+EXPORTS = \
+  nsPluginLogging.h \
+  nsPluginError.h \
+  nsPluginNativeWindow.h \
+  nsPluginsCID.h \
+  $(NULL)
 
-XPIDLSRCS 	= \
-		nspluginroot.idl \
-		nsIPluginStreamInfo.idl \
-		nsIPluginInstanceOwner.idl \
-		nsIPlugin.idl \
-		nsIHTTPHeaderListener.idl \
-		nsIPluginTag.idl \
-		nsIPluginTagInfo.idl \
-		nsIPluginInputStream.idl \
-		nsIPluginStreamListener.idl \
-		nsIPluginInstance.idl \
-		nsIPluginHost.idl \
-		nsIPluginDocument.idl \
-		$(NULL)
+SDK_HEADERS = \
+  npapi.h \
+  npfunctions.h \
+  nptypes.h \
+  npruntime.h \
+  $(NULL)
 
-# Just build headers if we don't want plugins support
-ifndef MOZ_PLUGINS
-NO_GEN_XPT=1
-endif
+XPIDLSRCS = \
+  nsIHTTPHeaderListener.idl \
+  nsIPlugin.idl \
+  nsIPluginDocument.idl \
+  nsIPluginHost.idl \
+  nsIPluginInputStream.idl \
+  nsIPluginInstance.idl \
+  nsIPluginInstanceOwner.idl \
+  nsIPluginStreamInfo.idl \
+  nsIPluginStreamListener.idl \
+  nsIPluginTag.idl \
+  nsIPluginTagInfo.idl \
+  nspluginroot.idl \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -208,11 +208,9 @@ endif
 	$(NSINSTALL) -D $@
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins
 	@(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -)
 	@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
 	@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
 	@(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/certs && tar -xf -)
-ifdef MOZ_PLUGINS
 	@(cd $(DIST_BIN)/plugins && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_PLUGINS)) | (cd $(PKG_STAGE)/bin/plugins && tar -xf -)
-endif
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -159,24 +159,20 @@ COMPONENT_LIBS +=  jetpack_s
 endif
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
 	jsctypes \
 	$(NULL)
 endif
 
-COMPONENT_LIBS += jsperf
-
-ifdef MOZ_PLUGINS
-DEFINES += -DMOZ_PLUGINS
 COMPONENT_LIBS += \
-	gkplugin \
-	$(NULL)
-endif
+  jsperf \
+  gkplugin \
+  $(NULL)
 
 ifdef MOZ_XUL
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += \
 	unixproxy \
 	$(NULL)
 endif
 endif
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -129,22 +129,18 @@
 
 #if defined(MOZ_IPC) && defined(ENABLE_JETPACK_SERVICE)
 #define JETPACK_MODULES \
     MODULE(jetpack)
 #else
 #define JETPACK_MODULES
 #endif
 
-#ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)
-#else
-#define PLUGINS_MODULES
-#endif
 
 #ifdef MOZ_JSDEBUGGER
 #define JSDEBUGGER_MODULES \
     MODULE(JavaScript_Debugger)
 #else
 #define JSDEBUGGER_MODULES
 #endif
 
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -36,53 +36,48 @@
 
 DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE       = extensions
-XPIDL_MODULE = extensions
+MODULE = extensions
 
 XPIDLSRCS = \
   amIInstallTrigger.idl \
   amIWebInstallListener.idl \
   amIWebInstaller.idl \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
   extensions.manifest \
   nsBlocklistService.js \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
+  AddonLogging.jsm \
   AddonManager.jsm \
   AddonRepository.jsm \
+  AddonUpdateChecker.jsm \
+  PluginProvider.jsm \
   XPIProvider.jsm \
-  AddonUpdateChecker.jsm \
-  AddonLogging.jsm \
   $(NULL)
 
-ifdef MOZ_PLUGINS
-  EXTRA_PP_JS_MODULES += PluginProvider.jsm
-  DEFINES += -DMOZ_PLUGINS
-endif
-
 EXTRA_JS_MODULES = \
   LightweightThemeManager.jsm \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
+  $(MOZ_JS_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/mozapps/extensions/extensions.manifest
@@ -3,11 +3,9 @@ contract @mozilla.org/extensions/blockli
 category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
 component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
 contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
 category update-timer addonManager @mozilla.org/addons/integration;1,getService,addon-background-update-timer,extensions.update.interval,86400
 component {7beb3ba8-6ec3-41b4-b67c-da89b8518922} amContentHandler.js
 contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {7beb3ba8-6ec3-41b4-b67c-da89b8518922}
 component {0f38e086-89a3-40a5-8ffc-9b694de1d04a} amWebInstallListener.js
 contract @mozilla.org/addons/web-install-listener;1 {0f38e086-89a3-40a5-8ffc-9b694de1d04a}
-#ifdef MOZ_PLUGINS
 category addon-provider-module PluginProvider resource://gre/modules/PluginProvider.jsm
-#endif