Bug 634807 - Remove MOZ_PLAINTEXT_EDITOR_ONLY; r=khuey
authorMatheus Kerschbaum <matjk7@gmail.com>
Thu, 24 Mar 2011 19:59:00 -0400
changeset 63908 17015e66511231d618d2915aecfc146c18a873a5
parent 63907 36d649518a47bd10f947486c807b656bc1d28542
child 63909 067fdfe97f0d9b0400e665d38578c0b3a0f670db
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs634807
milestone2.2a1pre
Bug 634807 - Remove MOZ_PLAINTEXT_EDITOR_ONLY; r=khuey
config/autoconf.mk.in
configure.in
editor/composer/Makefile.in
editor/libeditor/Makefile.in
layout/build/Makefile.in
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -116,17 +116,16 @@ MOZ_TRACEVIS    = @MOZ_TRACEVIS@
 DEHYDRA_PATH    = @DEHYDRA_PATH@
 
 NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
 USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
 USE_ELF_HACK = @USE_ELF_HACK@
 INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
-MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
 MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
--- a/configure.in
+++ b/configure.in
@@ -4977,17 +4977,16 @@ VPX_ASFLAGS=
 VPX_AS_DASH_C_FLAG=
 VPX_AS_CONVERSION=
 VPX_ASM_SUFFIX=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
-MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_FASTSTART=
@@ -5917,29 +5916,16 @@ if test "$MOZ_USE_NATIVE_UCONV"; then
     AC_DEFINE(MOZ_USE_NATIVE_UCONV)
 fi
 if test "$OS_ARCH" != "WINCE" -a "$OS_ARCH" != "WINNT" -a "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" != "yes"; then
     AC_MSG_ERROR([iconv() not found.  Cannot enable native uconv support.])
 fi
 
 
 dnl ========================================================
-dnl Libeditor can be build as plaintext-only,
-dnl or as a full html and text editing component.
-dnl We build both by default.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(plaintext-editor-only,
-[  --enable-plaintext-editor-only
-                          Allow only plaintext editing],
-    MOZ_PLAINTEXT_EDITOR_ONLY=1,
-    MOZ_PLAINTEXT_EDITOR_ONLY= )
-dnl Note the #define is MOZILLA, not MOZ, for compat with the Mac build.
-AC_SUBST(MOZ_PLAINTEXT_EDITOR_ONLY)
-
-dnl ========================================================
 dnl = Disable Fast Load
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(xpcom-fastload,
 [  --disable-xpcom-fastload
                           Disable XPCOM fastload support],
     MOZ_NO_FAST_LOAD=1,
     MOZ_NO_FAST_LOAD=)
 
--- a/editor/composer/Makefile.in
+++ b/editor/composer/Makefile.in
@@ -37,21 +37,17 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public
-
-ifndef MOZ_PLAINTEXT_EDITOR_ONLY
-DIRS		+= src
-endif
+DIRS		= public src
 
 ifdef ENABLE_TESTS
 DIRS		+= test
 endif
 
 # Enable Editor API Logging!
 ENABLE_EDITOR_API_LOG=1
 
--- a/editor/libeditor/Makefile.in
+++ b/editor/libeditor/Makefile.in
@@ -37,19 +37,13 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-HTML_DIR	= 
-else
-HTML_DIR	= html
-endif
-
-DIRS		= base text $(HTML_DIR)
+DIRS		= base text html
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -116,16 +116,18 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/dom/src/notification/$(LIB_PREFIX)jsdomnotification_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/system/$(LIB_PREFIX)domsystem_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/threads/$(LIB_PREFIX)domthreads_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/indexedDB/$(LIB_PREFIX)dom_indexeddb_s.$(LIB_SUFFIX) \
 	$(DEPTH)/editor/libeditor/text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX) \
 	$(DEPTH)/editor/libeditor/base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/parser/html/$(LIB_PREFIX)html5p_s.$(LIB_SUFFIX) \
 	$(DEPTH)/caps/src/$(LIB_PREFIX)caps_s.$(LIB_SUFFIX) \
+	$(DEPTH)/editor/libeditor/html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \
+	$(DEPTH)/editor/txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
 SHARED_LIBRARY_LIBS += \
 	$(DEPTH)/dom/system/unix/$(LIB_PREFIX)domsystemunix_s.$(LIB_SUFFIX) \
 	$(NULL)
 LOCAL_INCLUDES	+= \
 	-I$(topsrcdir)/dom/system/unix \
@@ -249,25 +251,16 @@ SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/svg/content/src/$(LIB_PREFIX)gkcontentsvg_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY
-else
-SHARED_LIBRARY_LIBS += \
-	$(DEPTH)/editor/libeditor/html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \
-	$(DEPTH)/editor/txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
-	$(NULL)
-endif
-
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif
 
 SHARED_LIBRARY_LIBS += \
 	$(DEPTH)/js/src/xpconnect/src/$(LIB_PREFIX)xpconnect_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -149,16 +149,17 @@ COMPONENT_LIBS += \
 	webbrwsr \
 	nsappshell \
 	txmgr \
 	commandlines \
 	toolkitcomps \
 	pipboot \
 	pipnss \
 	appcomps \
+	composer \
 	$(NULL)
 
 ifdef MOZ_IPC
 COMPONENT_LIBS +=  jetpack_s
 endif
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
@@ -227,22 +228,16 @@ COMPONENT_LIBS += cookie permissions
 DEFINES += -DMOZ_PERMISSIONS
 endif
 
 ifdef MOZ_UNIVERSALCHARDET
 COMPONENT_LIBS += universalchardet
 DEFINES += -DMOZ_UNIVERSALCHARDET
 endif
 
-ifndef MOZ_PLAINTEXT_EDITOR_ONLY
-COMPONENT_LIBS += composer
-else
-DEFINES += -DMOZ_PLAINTEXT_EDITOR_ONLY
-endif
-
 ifdef MOZ_RDF
 COMPONENT_LIBS += \
 	rdf \
 	windowds \
 	$(NULL)
 endif
 
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -92,22 +92,16 @@
 #ifdef MOZ_RDF
 #define RDF_MODULES \
     MODULE(nsRDFModule) \
     MODULE(nsWindowDataSourceModule)
 #else
 #define RDF_MODULES
 #endif
 
-#ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-#define COMPOSER_MODULE
-#else
-#define COMPOSER_MODULE MODULE(nsComposerModule)
-#endif
-
 #ifdef ACCESSIBILITY
 #define ACCESS_MODULES MODULE(nsAccessibilityModule)
 #else
 #define ACCESS_MODULES
 #endif
 
 #ifdef MOZ_ENABLE_XREMOTE
 #define XREMOTE_MODULES MODULE(RemoteServiceModule)
@@ -261,17 +255,17 @@
     PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
     MODULE(Browser_Embedding_Module)         \
     ACCESS_MODULES                           \
     MODULE(appshell)                         \
     MODULE(nsTransactionManagerModule)       \
-    COMPOSER_MODULE                          \
+    MODULE(nsComposerModule)                 \
     MODULE(application)                      \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
     FILEVIEW_MODULE                          \
     STORAGE_MODULE                           \
     PLACES_MODULES                           \
     MORK_MODULES                             \
     XULENABLED_MODULES                       \