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

Backed out changeset 7c0438df6767

Browse Source
This commit is contained in:
Bas Schouten
2010-08-27 22:52:02 +00:00
parent ff68deb92b
commit f358075bd1
8 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/app/Makefile.in
View File

@@ -92,12 +92,6 @@ endif
CPPSRCS = nsBrowserApp.cpp CPPSRCS = nsBrowserApp.cpp
LIBS += \
$(call EXPAND_LIBNAME_PATH,browsercomps,../components/build) \
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
ifdef BUILD_STATIC_LIBS ifdef BUILD_STATIC_LIBS

4
browser/app/nsBrowserApp.cpp
View File

@@ -106,8 +106,6 @@ public:
~ScopedLogging() { NS_LogTerm(); } ~ScopedLogging() { NS_LogTerm(); }
}; };
extern const mozilla::Module kBrowserModule;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
ScopedLogging log; ScopedLogging log;
@@ -157,8 +155,6 @@ int main(int argc, char* argv[])
return 255; return 255;
} }
XRE_AddStaticComponent(&kBrowserModule);
int result = XRE_main(argc, argv, appData); int result = XRE_main(argc, argv, appData);
XRE_FreeAppData(appData); XRE_FreeAppData(appData);
if (appEnv) if (appEnv)

13
browser/components/build/Makefile.in
View File

@@ -7,15 +7,18 @@ include $(DEPTH)/config/autoconf.mk
MODULE = browsercomps MODULE = browsercomps
LIBRARY_NAME = browsercomps LIBRARY_NAME = browsercomps
SHORT_LIBNAME = brwsrcmp
ifdef LIBXUL_SDK
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsBrowserCompsModule
FORCE_SHARED_LIB = 1 FORCE_SHARED_LIB = 1
else
FORCE_STATIC_LIB = 1 # Because we are an application component, link against the CRT statically
DEFINES += -DBROWSERCOMPS_LINK_STATICALLY # (on Windows, but only if we're not building our own CRT for jemalloc)
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif endif
EXPORTS = nsBrowserCompsCID.h EXPORTS = nsBrowserCompsCID.h
CPPSRCS = nsModule.cpp \ CPPSRCS = nsModule.cpp \

5
browser/components/build/nsModule.cpp
View File

@@ -237,13 +237,12 @@ static const mozilla::Module::CategoryEntry kBrowserCategories[] = {
{ NULL } { NULL }
}; };
extern const mozilla::Module kBrowserModule = { static const mozilla::Module kBrowserModule = {
mozilla::Module::kVersion, mozilla::Module::kVersion,
kBrowserCIDs, kBrowserCIDs,
kBrowserContracts, kBrowserContracts,
kBrowserCategories kBrowserCategories
}; };
#ifndef BROWSERCOMPS_LINK_STATICALLY
NSMODULE_DEFN(nsBrowserCompsModule) = &kBrowserModule; NSMODULE_DEFN(nsBrowserCompsModule) = &kBrowserModule;
#endif

5
browser/components/dirprovider/Makefile.in
View File

@@ -63,4 +63,9 @@ CPPSRCS = DirectoryProvider.cpp
LOCAL_INCLUDES = -I$(srcdir)/../build LOCAL_INCLUDES = -I$(srcdir)/../build
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

2
browser/installer/Makefile.in
View File

@@ -110,8 +110,6 @@ endif
ifndef LIBXUL_SDK ifndef LIBXUL_SDK
INSTALL_SDK = 1 INSTALL_SDK = 1
else
DEFINES += -DLIBXUL_SDK=1
endif endif
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk include $(topsrcdir)/toolkit/mozapps/installer/packager.mk

4
browser/installer/package-manifest.in
View File

@@ -334,8 +334,10 @@
@BINPATH@/components/nsSessionStore.js @BINPATH@/components/nsSessionStore.js
@BINPATH@/components/nsURLFormatter.manifest @BINPATH@/components/nsURLFormatter.manifest
@BINPATH@/components/nsURLFormatter.js @BINPATH@/components/nsURLFormatter.js
#ifdef LIBXUL_SDK #ifndef XP_OS2
@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
#else
@BINPATH@/components/brwsrcmp@DLL_SUFFIX@
#endif #endif
@BINPATH@/components/txEXSLTRegExFunctions.manifest @BINPATH@/components/txEXSLTRegExFunctions.manifest
@BINPATH@/components/txEXSLTRegExFunctions.js @BINPATH@/components/txEXSLTRegExFunctions.js

3
browser/installer/removed-files.in
View File

@@ -37,9 +37,6 @@ chrome/toolkit.manifest
component.reg component.reg
components/browser.manifest components/browser.manifest
components/components.list components/components.list
#ifndef LIBXUL_SDK
components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
#endif
components/@DLL_PREFIX@browserdirprovider@DLL_SUFFIX@ components/@DLL_PREFIX@browserdirprovider@DLL_SUFFIX@
components/@DLL_PREFIX@brwsrdir@DLL_SUFFIX@ components/@DLL_PREFIX@brwsrdir@DLL_SUFFIX@
components/@DLL_PREFIX@myspell@DLL_SUFFIX@ components/@DLL_PREFIX@myspell@DLL_SUFFIX@