Commit ae7a851b authored by benjamin%smedbergs.us's avatar benjamin%smedbergs.us
Browse files

Bug 335807 - Make xpfe/components/intl its own component, r=neil (this gets... 

Bug 335807 - Make xpfe/components/intl its own component, r=neil (this gets rid of xpfe/components/build2 for tbird, yay!)
parent cb2a7554

toolkit/library/libxul-config.mk

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ COMPONENT_LIBS += \ 
	mozfind \

	appcomps \

	windowds \

	intlapp \

	commandlines \

	toolkitcomps \

	xpinstall \

toolkit/library/nsStaticXULComponents.cpp

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ 
    MODULE(nsFindComponent)                  \

    MODULE(application)                      \

    MODULE(nsWindowDataSourceModule)         \

    MODULE(nsXPIntlModule)                   \

    MODULE(Apprunner)                        \

    MODULE(CommandLineModule)                \

    PLACES_MODULES                           \

xpfe/components/Makefile.in

+0 −3
Original line number Diff line number Diff line
@@ -130,9 +130,6 @@ ifeq ($(OS_ARCH),WINNT) 
DIRS += winhooks

endif



# build2 should be last

DIRS += build2



endif



ifndef MOZ_XUL_APP

xpfe/components/build/Makefile.in

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ SHARED_LIBRARY_LIBS = \ 


ifneq ($(MOZ_BUILD_APP),macbrowser)

SHARED_LIBRARY_LIBS += \

	../intl/$(LIB_PREFIX)appcompintl_s.$(LIB_SUFFIX) \

	../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \

	$(NULL)

endif

xpfe/components/build/nsModule.cpp

+0 −9
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
#include "nsICategoryManager.h"

#include "rdf.h"

#include "nsXPIDLString.h"

#include "nsCharsetMenu.h"

#include "nsDirectoryViewer.h"

#include "nsFontPackageHandler.h"

#include "nsRDFCID.h"



#if !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER)
@@ -88,7 +86,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init) 
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)



#if !defined(MOZ_MACBROWSER)

NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler)

NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)

NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance)

#endif
@@ -207,12 +204,6 @@ static const nsModuleComponentInfo components[] = { 
#endif // !defined(MOZ_PHOENIX) && !defined(MOZ_XULRUNNER) && !defined(MOZ_MACBROWSER)



#if !defined(MOZ_MACBROWSER)

    { "nsCharsetMenu", NS_CHARSETMENU_CID,

      NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID,

      NS_NewCharsetMenu },

    { "nsFontPackageHandler", NS_FONTPACKAGEHANDLER_CID,

      "@mozilla.org/locale/default-font-package-handler;1",

      nsFontPackageHandlerConstructor },

    { NS_BROWSERSTATUSFILTER_CLASSNAME,

      NS_BROWSERSTATUSFILTER_CID,

      NS_BROWSERSTATUSFILTER_CONTRACTID,