Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

for bug 157567

Browse Source 
combine txtsvc into libeditor - no need for seperate dlls
r=akkana, sr=kin
This commit is contained in:
alecf%netscape.com 2002-08-22 22:08:36 +00:00
parent 8136e2ad93
commit 794d931f00
10 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/mac/build_scripts/MozillaBuildList.pm
View File

@ -2060,7 +2060,6 @@ sub BuildEditorProjects()
StartBuildModule("editor");
BuildOneProject(":mozilla:editor:txmgr:macbuild:txmgr.xml", "EditorTxmgr$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:editor:txtsvc:macbuild:txtsvc.xml", "TextServices$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
# note: only build one of the following targets
BuildOneProject(":mozilla:editor:macbuild:editor.xml", "htmleditor$D.$S", 1, $main::ALIAS_SYM_FILES, 1);

5
editor/libeditor/build/Makefile.in
View File

@ -55,6 +55,9 @@ REQUIRES = xpcom \
appshell \
xuldoc \
commandhandler \
gfx \
widget \
txtsvc \
$(NULL)
ifdef MOZ_PLAINTEXT_EDITOR_ONLY
@ -71,6 +74,7 @@ else
CPPSRCS = nsEditorRegistration.cpp
SHARED_LIBRARY_LIBS = \
../html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \
../../txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
$(NULL)
# ../composer/src/$(LIB_PREFIX)composer_s.$(LIB_SUFFIX)
endif
@ -94,5 +98,6 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(topsrcdir)/editor/libeditor/base \
-I$(topsrcdir)/editor/libeditor/text \
-I$(topsrcdir)/editor/libeditor/html \
-I$(topsrcdir)/editor/txtsvc/src \
-I$(topsrcdir)/editor/composer/src

7
editor/libeditor/build/nsEditorRegistration.cpp
View File

@ -46,6 +46,9 @@
#include "nsEditorController.h" //CID
#include "nsTextServicesDocument.h"
#include "nsTextServicesCID.h"
////////////////////////////////////////////////////////////////////////
// Define the contructor function for the objects
//
@ -55,6 +58,7 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorController)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextServicesDocument)
#ifdef ENABLE_EDITOR_API_LOG
#include "nsHTMLEditorLog.h"
@ -91,6 +95,9 @@ static const nsModuleComponentInfo components[] = {
{ "Editor Controller", NS_EDITORCONTROLLER_CID,
"@mozilla.org/editor/editorcontroller;1",
nsEditorControllerConstructor, },
{ NULL, NS_TEXTSERVICESDOCUMENT_CID,
"@mozilla.org/textservices/textservicesdocument;1",
nsTextServicesDocumentConstructor },
};
////////////////////////////////////////////////////////////////////////

6
editor/txtsvc/src/Makefile.in
View File

@ -27,9 +27,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = txtsvc
LIBRARY_NAME = txtsvc
LIBRARY_NAME = txtsvc_s
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
FORCE_STATIC_LIB = 1
MODULE_NAME = nsTextServicesModule
REQUIRES = xpcom \
string \
@ -44,10 +44,10 @@ REQUIRES = xpcom \
CPPSRCS = \
nsTextServicesDocument.cpp \
nsTextServicesFactory.cpp \
nsTSDNotifier.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

1
xpinstall/packager/mac/browser.jst
View File

@ -12,6 +12,7 @@ function upgradeCleanup()
deleteThisFile("Components", "ucvlatin.shlb");
deleteThisFile("Components", "ucvcn.shlb");
deleteThisFile("Components", "ucvibm.shlb");
deleteThisFile("Components", "TextServices.shlb");
deleteThisFile("Program", "defaults/pref/config.js");
deleteThisFile("Program", "defaults/pref/initpref.js");
deleteThisFile("Program", "defaults/pref/macxprefs.js");

1
xpinstall/packager/packages-mac
View File

@ -176,7 +176,6 @@ viewer:Components:search.xpt
viewer:Components:shistory.shlb
viewer:Components:shistory.xpt
viewer:Components:strres.shlb
viewer:Components:TextServices.shlb
viewer:Components:tmbm.xpt
viewer:Components:txmgr.xpt
viewer:Components:uconv.shlb

1
xpinstall/packager/packages-unix
View File

@ -147,7 +147,6 @@ bin/components/librdf.so
bin/components/libshistory.so
bin/components/libstrres.so
bin/components/libtxmgr.so
bin/components/libtxtsvc.so
bin/components/libuconv.so
bin/components/libucvmath.so
bin/components/liburiloader.so

1
xpinstall/packager/packages-win
View File

@ -201,7 +201,6 @@ bin\components\signonviewer.xpt
bin\components\strres.dll
bin\components\txmgr.dll
bin\components\txmgr.xpt
bin\components\txtsvc.dll
bin\components\uconv.dll
bin\components\uconv.xpt
bin\components\ucvmath.dll

1
xpinstall/packager/unix/browser.jst
View File

@ -13,6 +13,7 @@ function upgradeCleanup()
deleteThisFile("Components", "libucvlatin.so");
deleteThisFile("Components", "libucvcn.so");
deleteThisFile("Components", "libucvibm.so");
deleteThisFile("Components", "libtxtsvc.so");
deleteThisFile("Program", "defaults/pref/config.js");
deleteThisFile("Program", "defaults/pref/initpref.js");
deleteThisFile("Program", "defaults/wallet/URLFieldSchema.tbl");

1
xpinstall/packager/windows/browser.jst
View File

@ -484,6 +484,7 @@ function upgradeCleanup()
deleteThisFile("Components", "ucvlatin.dll");
deleteThisFile("Components", "ucvcn.dll");
deleteThisFile("Components", "ucvibm.dll");
deleteThisFile("Components", "txtsvc.dll");
deleteThisFile("Chrome", "chrome.rdf");
deleteThisFolder("Chrome", "overlayinfo");
}