mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Static build fixes - update for components which have been merged together.

This commit is contained in:
bryner%netscape.com 2003-03-08 11:37:44 +00:00
Родитель 890fe6727f
Коммит 9dda3018ca
2 изменённых файлов: 33 добавлений и 307 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

300
camino/Chimera.pbproj/project.pbxproj
Просмотреть файл

@ -934,6 +934,18 @@
settings = {
};
};
A72CB3D8041A0BA100A967F8 = {
isa = PBXFileReference;
name = libgfxshared_s.a;
path = ../gfx/src/shared/libgfxshared_s.a;
refType = 2;
};
A72CB3DA041A0BEB00A967F8 = {
fileRef = A72CB3D8041A0BA100A967F8;
isa = PBXBuildFile;
settings = {
};
};
A7AC092704161E7200A967F8 = {
isa = PBXFileReference;
name = libmozz.dylib;
@ -958,6 +970,18 @@
settings = {
};
};
A7E5D960041A07C900A967F8 = {
isa = PBXFileReference;
name = libi18n.a;
path = ../intl/build/libi18n.a;
refType = 2;
};
A7E5D961041A07DF00A967F8 = {
fileRef = A7E5D960041A07C900A967F8;
isa = PBXBuildFile;
settings = {
};
};
//A70
//A71
//A72
@ -968,18 +992,6 @@
//F52
//F53
//F54
F506477602AD7E2701A967F3 = {
isa = PBXFileReference;
name = libunicharutil.a;
path = ../intl/unicharutil/src/libunicharutil.a;
refType = 2;
};
F506477702AD7E2801A967F3 = {
fileRef = F506477602AD7E2701A967F3;
isa = PBXBuildFile;
settings = {
};
};
F507423C02AD808201A967F3 = {
isa = PBXFileReference;
name = libcrmf.a;
@ -1673,66 +1685,6 @@
path = "";
refType = 4;
};
F513437402DA286001A967F3 = {
isa = PBXFileReference;
name = libucvcn.a;
path = ../intl/uconv/ucvcn/libucvcn.a;
refType = 2;
};
F513437502DA286001A967F3 = {
isa = PBXFileReference;
name = libucvja.a;
path = ../intl/uconv/ucvja/libucvja.a;
refType = 2;
};
F513437602DA286001A967F3 = {
isa = PBXFileReference;
name = libucvko.a;
path = ../intl/uconv/ucvko/libucvko.a;
refType = 2;
};
F513437702DA286001A967F3 = {
isa = PBXFileReference;
name = libucvtw.a;
path = ../intl/uconv/ucvtw/libucvtw.a;
refType = 2;
};
F513437802DA286001A967F3 = {
isa = PBXFileReference;
name = libucvtw2.a;
path = ../intl/uconv/ucvtw2/libucvtw2.a;
refType = 2;
};
F513437902DA286101A967F3 = {
fileRef = F513437402DA286001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F513437A02DA286101A967F3 = {
fileRef = F513437502DA286001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F513437B02DA286101A967F3 = {
fileRef = F513437602DA286001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F513437C02DA286101A967F3 = {
fileRef = F513437702DA286001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F513437D02DA286101A967F3 = {
fileRef = F513437802DA286001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F5137A1102676B9101026D05 = {
fileEncoding = 30;
isa = PBXFileReference;
@ -3856,18 +3808,6 @@
settings = {
};
};
F5461CB903AABF4501A96660 = {
isa = PBXFileReference;
name = libjsloader.a;
path = ../js/src/xpconnect/loader/libjsloader.a;
refType = 2;
};
F5461CBA03AABF4501A96660 = {
fileRef = F5461CB903AABF4501A96660;
isa = PBXBuildFile;
settings = {
};
};
F5461CBB03AAC25C01A96660 = {
isa = PBXFileReference;
name = nsProxyAutoConfig.js;
@ -4814,42 +4754,29 @@
};
F56F242202AC6F7101A967F3 = {
children = (
F56F242302AC706801A967F3,
F56F242502AC706801A967F3,
F56F242602AC706801A967F3,
F56F242702AC706801A967F3,
F56F242802AC706801A967F3,
F56F242902AC706801A967F3,
F56F242A02AC706801A967F3,
F56F242B02AC706801A967F3,
F56F243002AC706801A967F3,
F56F243202AC706801A967F3,
F56F243302AC706801A967F3,
F56F244502AC714601A967F3,
F56F244602AC714601A967F3,
F56F244702AC714601A967F3,
F56F244802AC714601A967F3,
F56F244902AC714601A967F3,
F56F244B02AC714601A967F3,
F56F244C02AC714601A967F3,
F56F244D02AC714601A967F3,
F56F244E02AC714601A967F3,
F56F245002AC714601A967F3,
F56F245102AC714601A967F3,
F56F246002AC723001A967F3,
F56F246102AC723001A967F3,
F56F246202AC723001A967F3,
F56F246302AC723001A967F3,
F56F246402AC723001A967F3,
F56F246502AC723001A967F3,
F56F246602AC723001A967F3,
F56F246902AC723001A967F3,
F56F246A02AC723001A967F3,
F5461CB903AABF4501A96660,
F56F246B02AC723001A967F3,
F56F246F02AC723001A967F3,
F56F247002AC723001A967F3,
F56F247102AC723001A967F3,
F56F247302AC723001A967F3,
F56F247402AC723001A967F3,
F56F248B02AC729901A967F3,
@ -4858,33 +4785,17 @@
F56F249002AC729901A967F3,
F56F249302AC729901A967F3,
F56F249402AC729901A967F3,
F506477602AD7E2701A967F3,
F507423C02AD808201A967F3,
F524EF6702AD8B9301A967F3,
F54AD84402C115D901A967F3,
F513437402DA286001A967F3,
F513437502DA286001A967F3,
F513437602DA286001A967F3,
F513437702DA286001A967F3,
F513437802DA286001A967F3,
F5E47654030C5FD501A967F3,
A7E5D960041A07C900A967F8,
A72CB3D8041A0BA100A967F8,
);
isa = PBXGroup;
name = "Gecko Static Components";
refType = 4;
};
F56F242302AC706801A967F3 = {
isa = PBXFileReference;
name = libchardet.a;
path = ../intl/chardet/src/libchardet.a;
refType = 2;
};
F56F242502AC706801A967F3 = {
isa = PBXFileReference;
name = liblwbrk.a;
path = ../intl/lwbrk/src/liblwbrk.a;
refType = 2;
};
F56F242602AC706801A967F3 = {
isa = PBXFileReference;
name = libnecko.a;
@ -4897,36 +4808,12 @@
path = ../netwerk/build2/libnecko2.a;
refType = 2;
};
F56F242802AC706801A967F3 = {
isa = PBXFileReference;
name = libnkcache.a;
path = ../netwerk/cache/src/libnkcache.a;
refType = 2;
};
F56F242902AC706801A967F3 = {
isa = PBXFileReference;
name = libnslocale.a;
path = ../intl/locale/src/mac/libnslocale.a;
refType = 2;
};
F56F242A02AC706801A967F3 = {
isa = PBXFileReference;
name = libstrres.a;
path = ../intl/strres/src/libstrres.a;
refType = 2;
};
F56F242B02AC706801A967F3 = {
isa = PBXFileReference;
name = libuconv.a;
path = ../intl/uconv/src/libuconv.a;
refType = 2;
};
F56F243002AC706801A967F3 = {
isa = PBXFileReference;
name = libucvlatin.a;
path = ../intl/uconv/ucvlatin/libucvlatin.a;
refType = 2;
};
F56F243202AC706801A967F3 = {
isa = PBXFileReference;
name = liburiloader.a;
@ -4939,18 +4826,6 @@
path = ../js/src/xpconnect/src/libxpconnect.a;
refType = 2;
};
F56F243402AC706801A967F3 = {
fileRef = F56F242302AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F243602AC706801A967F3 = {
fileRef = F56F242502AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F243702AC706801A967F3 = {
fileRef = F56F242602AC706801A967F3;
isa = PBXBuildFile;
@ -4963,36 +4838,12 @@
settings = {
};
};
F56F243902AC706801A967F3 = {
fileRef = F56F242802AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F243A02AC706801A967F3 = {
fileRef = F56F242902AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F243B02AC706801A967F3 = {
fileRef = F56F242A02AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F243C02AC706801A967F3 = {
fileRef = F56F242B02AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F244102AC706801A967F3 = {
fileRef = F56F243002AC706801A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F244302AC706801A967F3 = {
fileRef = F56F243202AC706801A967F3;
isa = PBXBuildFile;
@ -5023,40 +4874,16 @@
path = ../gfx/src/mac/libgfx_mac.a;
refType = 2;
};
F56F244802AC714601A967F3 = {
isa = PBXFileReference;
name = libgfx2.a;
path = ../gfx2/src/libgfx2.a;
refType = 2;
};
F56F244902AC714601A967F3 = {
isa = PBXFileReference;
name = libhtmlpars.a;
path = ../htmlparser/src/libhtmlpars.a;
refType = 2;
};
F56F244B02AC714601A967F3 = {
isa = PBXFileReference;
name = libimggif.a;
path = ../modules/libpr0n/decoders/gif/libimggif.a;
refType = 2;
};
F56F244C02AC714601A967F3 = {
isa = PBXFileReference;
name = libimgjpeg.a;
path = ../modules/libpr0n/decoders/jpeg/libimgjpeg.a;
refType = 2;
};
F56F244D02AC714601A967F3 = {
isa = PBXFileReference;
name = libimglib2.a;
path = ../modules/libpr0n/src/libimglib2.a;
refType = 2;
};
F56F244E02AC714601A967F3 = {
isa = PBXFileReference;
name = libimgpng.a;
path = ../modules/libpr0n/decoders/png/libimgpng.a;
path = ../modules/libpr0n/build/libimglib2.a;
refType = 2;
};
F56F245002AC714601A967F3 = {
@ -5089,42 +4916,18 @@
settings = {
};
};
F56F245502AC714701A967F3 = {
fileRef = F56F244802AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245602AC714701A967F3 = {
fileRef = F56F244902AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245802AC714701A967F3 = {
fileRef = F56F244B02AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245902AC714701A967F3 = {
fileRef = F56F244C02AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245A02AC714701A967F3 = {
fileRef = F56F244D02AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245B02AC714701A967F3 = {
fileRef = F56F244E02AC714601A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F245D02AC714701A967F3 = {
fileRef = F56F245002AC714601A967F3;
isa = PBXBuildFile;
@ -5155,12 +4958,6 @@
path = ../embedding/components/build/libembedcomponents.a;
refType = 2;
};
F56F246302AC723001A967F3 = {
isa = PBXFileReference;
name = libgkcontent.a;
path = ../content/build/libgkcontent.a;
refType = 2;
};
F56F246402AC723001A967F3 = {
isa = PBXFileReference;
name = libgklayout.a;
@ -5200,7 +4997,7 @@
F56F246F02AC723001A967F3 = {
isa = PBXFileReference;
name = libprofile.a;
path = ../profile/src/libprofile.a;
path = ../profile/build/libprofile.a;
refType = 2;
};
F56F247002AC723001A967F3 = {
@ -5209,12 +5006,6 @@
path = ../editor/txmgr/src/libtxmgr.a;
refType = 2;
};
F56F247102AC723001A967F3 = {
isa = PBXFileReference;
name = libtxtsvc.a;
path = ../editor/txtsvc/src/libtxtsvc.a;
refType = 2;
};
F56F247302AC723001A967F3 = {
isa = PBXFileReference;
name = libwebbrwsr.a;
@ -5245,12 +5036,6 @@
settings = {
};
};
F56F247902AC723101A967F3 = {
fileRef = F56F246302AC723001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F247A02AC723101A967F3 = {
fileRef = F56F246402AC723001A967F3;
isa = PBXBuildFile;
@ -5299,12 +5084,6 @@
settings = {
};
};
F56F248702AC723101A967F3 = {
fileRef = F56F247102AC723001A967F3;
isa = PBXBuildFile;
settings = {
};
};
F56F248902AC723101A967F3 = {
fileRef = F56F247302AC723001A967F3;
isa = PBXBuildFile;
@ -7199,7 +6978,7 @@
);
buildSettings = {
DEBUGGING_SYMBOLS = NO;
FRAMEWORK_SEARCH_PATHS = /Users/sdagley/Library/Frameworks;
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "../dist/include/helperAppDlg ../dist/include/exthandler ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/chardet ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers\"";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/lib/components ../intl/unicharutil/src ../gfx/src ../js/src/liveconnect ../intl/unicharutil/util ../js/src/xpconnect/loader";
@ -7647,33 +7426,21 @@
files = (
F5BAAB9C02AC4AA701A967F3,
F5BAAB9D02AC4AA701A967F3,
F56F243402AC706801A967F3,
F56F243602AC706801A967F3,
F56F243702AC706801A967F3,
F56F243802AC706801A967F3,
F56F243902AC706801A967F3,
F56F243A02AC706801A967F3,
F56F243B02AC706801A967F3,
F56F243C02AC706801A967F3,
F56F244102AC706801A967F3,
F56F244302AC706801A967F3,
F56F244402AC706801A967F3,
F5461CBA03AABF4501A96660,
F56F245202AC714701A967F3,
F56F245302AC714701A967F3,
F56F245402AC714701A967F3,
F56F245502AC714701A967F3,
F56F245602AC714701A967F3,
F56F245802AC714701A967F3,
F56F245902AC714701A967F3,
F56F245A02AC714701A967F3,
F56F245B02AC714701A967F3,
F56F245D02AC714701A967F3,
F56F245E02AC714701A967F3,
F56F247602AC723101A967F3,
F56F247702AC723101A967F3,
F56F247802AC723101A967F3,
F56F247902AC723101A967F3,
F56F247A02AC723101A967F3,
F56F247B02AC723101A967F3,
F56F247C02AC723101A967F3,
@ -7682,7 +7449,6 @@
F56F248102AC723101A967F3,
F56F248502AC723101A967F3,
F56F248602AC723101A967F3,
F56F248702AC723101A967F3,
F56F248902AC723101A967F3,
F56F248A02AC723101A967F3,
F56F249502AC729901A967F3,
@ -7691,17 +7457,13 @@
F56F249A02AC729901A967F3,
F56F249D02AC729901A967F3,
F56F249E02AC729901A967F3,
F506477702AD7E2801A967F3,
F507423D02AD808301A967F3,
F524EF6802AD8B9401A967F3,
F5AC38BA02AD8E7B01A967F3,
F54AD84502C115DA01A967F3,
F513437902DA286101A967F3,
F513437A02DA286101A967F3,
F513437B02DA286101A967F3,
F513437C02DA286101A967F3,
F513437D02DA286101A967F3,
F5E47655030C5FD501A967F3,
A7E5D961041A07DF00A967F8,
A72CB3DA041A0BEB00A967F8,
F5BAAB9B02AC4AA701A967F3,
F5BAAB9E02AC4AA701A967F3,
F5BAABA002AC4AA701A967F3,

40
camino/src/application/nsStaticComponents.cpp
Просмотреть файл

@ -47,20 +47,9 @@ NSGETMODULE(_name) (nsIComponentManager* aCompMgr, \
}
// NSGetModule entry points
DECL_NSGETMODULE(UcharUtil)
DECL_NSGETMODULE(nsI18nModule)
DECL_NSGETMODULE(nsUConvModule)
DECL_NSGETMODULE(nsUCvJAModule)
DECL_NSGETMODULE(nsUCvCnModule)
DECL_NSGETMODULE(nsUCvLatinModule)
DECL_NSGETMODULE(nsUCvTWModule)
DECL_NSGETMODULE(nsUCvTW2Module)
DECL_NSGETMODULE(nsUCvKoModule)
DECL_NSGETMODULE(nsLocaleModule)
DECL_NSGETMODULE(nsStringBundleModule)
DECL_NSGETMODULE(nsLWBrkModule)
DECL_NSGETMODULE(nsCharDetModule)
DECL_NSGETMODULE(xpconnect)
DECL_NSGETMODULE(cacheservice)
DECL_NSGETMODULE(necko_core_and_primary_protocols)
DECL_NSGETMODULE(necko_secondary_protocols)
DECL_NSGETMODULE(nsURILoaderModule)
@ -71,18 +60,12 @@ DECL_NSGETMODULE(nsChromeModule)
DECL_NSGETMODULE(nsRDFModule)
DECL_NSGETMODULE(nsParserModule)
DECL_NSGETMODULE(nsGfxMacModule)
DECL_NSGETMODULE(nsGfx2Module)
DECL_NSGETMODULE(nsImageLib2Module)
DECL_NSGETMODULE(nsPNGDecoderModule)
DECL_NSGETMODULE(nsGIFModule2)
DECL_NSGETMODULE(nsJPEGDecoderModule)
DECL_NSGETMODULE(nsPluginModule)
DECL_NSGETMODULE(javascript__protocol)
DECL_NSGETMODULE(JS_component_loader)
DECL_NSGETMODULE(DOM_components)
DECL_NSGETMODULE(nsViewModule)
DECL_NSGETMODULE(nsWidgetMacModule)
DECL_NSGETMODULE(nsContentModule)
DECL_NSGETMODULE(nsLayoutModule)
DECL_NSGETMODULE(nsMorkModule)
DECL_NSGETMODULE(docshell_provider)
@ -90,7 +73,6 @@ DECL_NSGETMODULE(embedcomponents)
DECL_NSGETMODULE(Browser_Embedding_Module)
DECL_NSGETMODULE(nsEditorModule)
DECL_NSGETMODULE(nsTransactionManagerModule)
DECL_NSGETMODULE(nsTextServicesModule)
DECL_NSGETMODULE(nsProfileModule)
DECL_NSGETMODULE(Session_History_Module)
DECL_NSGETMODULE(application)
@ -106,20 +88,9 @@ DECL_NSGETMODULE(NSS)
*/
static nsStaticModuleInfo gStaticModuleInfo[] = {
#define MODULE(_name) { (#_name), NSGETMODULE(_name) }
MODULE(UcharUtil),
MODULE(nsI18nModule),
MODULE(nsUConvModule),
MODULE(nsUCvJAModule),
MODULE(nsUCvCnModule),
MODULE(nsUCvLatinModule),
MODULE(nsUCvTWModule),
MODULE(nsUCvTW2Module),
MODULE(nsUCvKoModule),
MODULE(nsLocaleModule),
MODULE(nsStringBundleModule),
MODULE(nsLWBrkModule),
MODULE(nsCharDetModule),
MODULE(xpconnect),
MODULE(cacheservice),
MODULE(necko_core_and_primary_protocols),
MODULE(necko_secondary_protocols),
MODULE(nsURILoaderModule),
@ -130,18 +101,12 @@ MODULE(nsChromeModule),
MODULE(nsRDFModule),
MODULE(nsParserModule),
MODULE(nsGfxMacModule),
MODULE(nsGfx2Module),
MODULE(nsImageLib2Module),
MODULE(nsPNGDecoderModule),
MODULE(nsGIFModule2),
MODULE(nsJPEGDecoderModule),
MODULE(nsPluginModule),
MODULE(javascript__protocol),
MODULE(JS_component_loader),
MODULE(DOM_components),
MODULE(nsViewModule),
MODULE(nsWidgetMacModule),
MODULE(nsContentModule),
MODULE(nsLayoutModule),
MODULE(nsMorkModule),
MODULE(docshell_provider),
@ -149,7 +114,6 @@ MODULE(embedcomponents),
MODULE(Browser_Embedding_Module),
MODULE(nsEditorModule),
MODULE(nsTransactionManagerModule),
MODULE(nsTextServicesModule),
MODULE(nsProfileModule),
MODULE(Session_History_Module),
MODULE(application),