corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 344243 - move suiterunner help over to toolkit help viewer (and build toolkit typeaheadfind), r=bsmedberg on configure.in change, r=Neil for the rest, sr=Neil

Browse Source
This commit is contained in:
kairo@kairo.at
2006-11-01 17:07:23 +00:00
parent 92d8de0843
commit 33cf5e29bb
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@@ -4266,7 +4266,11 @@ suite)
MOZ_SUITE=1
MOZ_PROFILESHARING=
MOZ_APP_VERSION=$SEAMONKEY_VERSION
MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
if test "$MOZ_XUL_APP"; then
MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
else
MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
fi
AC_DEFINE(MOZ_SUITE)
;;
@@ -5548,6 +5552,11 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman`
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
fi
if test "$MOZ_XUL_APP" && test `echo "$MOZ_EXTENSIONS" | grep -c help` -ne 0; then
AC_MSG_WARN([Cannot build old help extension with MOZ_XUL_APP set. Removing help from MOZ_EXTENSIONS.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|help||'`
fi
dnl This might be temporary: build tridentprofile only on Windows
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.])

9
toolkit/components/Makefile.in
View File

@@ -58,13 +58,8 @@ DIRS += \
filepicker \
console \
viewconfig \
$(NULL)
ifndef MOZ_SUITE
# XXX Suite doesn't want these just yet
DIRS += \
typeaheadfind \
$(NULL)
endif # MOZ_SUITE
ifdef MOZ_FEEDS
DIRS += feeds
@@ -102,12 +97,12 @@ endif # MOZ_XUL
endif # MOZ_SUITE
endif # MOZ_THUNDERBIRD
ifndef MOZ_SUITE
# XXX Suite doesn't want these just yet
ifdef MOZ_XUL
DIRS += help
endif
ifndef MOZ_SUITE
# XXX Suite doesn't want these just yet
ifdef MOZ_XPINSTALL
ifdef MOZ_RDF
DIRS += downloads

3
toolkit/components/build/Makefile.in
View File

@@ -127,11 +127,8 @@ ifdef MOZ_FEEDS
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
endif
ifndef MOZ_SUITE
# XXX Suite isn't ready to build this just yet
SHARED_LIBRARY_LIBS += ../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX)
EXTRA_DSO_LIBS = gkgfx
endif
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \

6
toolkit/components/build/nsToolkitCompsModule.cpp
View File

@@ -52,9 +52,9 @@
#include "nsDownloadProxy.h"
#endif
#endif
#endif // MOZ_SUITE
#include "nsTypeAheadFind.h"
#endif // MOZ_SUITE
#ifdef MOZ_URL_CLASSIFIER
#include "nsUrlClassifierDBService.h"
@@ -82,9 +82,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
#endif
#endif
#endif // MOZ_SUITE
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
#endif // MOZ_SUITE
#ifdef MOZ_URL_CLASSIFIER
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsUrlClassifierDBService,
@@ -129,12 +129,12 @@ static const nsModuleComponentInfo components[] =
nsDownloadProxyConstructor },
#endif
#endif
#endif // MOZ_SUITE
{ "TypeAheadFind Component",
NS_TYPEAHEADFIND_CID,
NS_TYPEAHEADFIND_CONTRACTID,
nsTypeAheadFindConstructor
},
#endif // MOZ_SUITE
#ifdef MOZ_URL_CLASSIFIER
{ "Url Classifier DB Service",
NS_URLCLASSIFIERDBSERVICE_CID,