Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 253742 No way of installing platform specific XPCOM components (dll/so) based on user OS.

Browse Source 
patch by jens.b@web.de r=bsmedberg a=asa


git-svn-id: svn://10.0.0.236/trunk@174247 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2005-06-07 22:10:56 +00:00
parent a3213449ca
commit 4d6cecd2eb
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/toolkit/xre/Makefile.in
View File

@@ -173,6 +173,11 @@ ifdef BUILD_STATIC_LIBS
DEFINES += -D_BUILD_STATIC_BIN
endif
DEFINES += -DOS_TARGET=\"$(OS_TARGET)\"
ifdef TARGET_XPCOM_ABI
DEFINES += -DTARGET_OS_ABI=\"$(OS_TARGET)_$(TARGET_XPCOM_ABI)\"
endif
export:: $(addprefix $(topsrcdir)/xpfe/bootstrap/, $(SHAREDCPPSRCS) $(SHAREDCMMSRCS)) $(STACKWALK_CPPSRCS)
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $^ $(srcdir)

29
mozilla/toolkit/xre/nsXREDirProvider.cpp
View File

@@ -393,6 +393,10 @@ LoadDirsIntoArray(nsIFile* aComponentsList, const char* aSection,
break;
nsCOMPtr<nsILocalFile> dir(do_CreateInstance("@mozilla.org/file/local;1"));
nsCOMPtr<nsIFile> platformDir;
#ifdef TARGET_OS_ABI
nsCOMPtr<nsIFile> platformABIDir;
#endif
rv = dir->SetPersistentDescriptor(nsDependentCString(parserBuf));
if (NS_FAILED(rv)) {
// Must be a relative descriptor, relative to the profile directory,
@@ -404,9 +408,24 @@ LoadDirsIntoArray(nsIFile* aComponentsList, const char* aSection,
if (NS_FAILED(rv))
continue;
}
dir->Clone(getter_AddRefs(platformDir));
platformDir->AppendNative(NS_LITERAL_CSTRING("platform"));
platformDir->AppendNative(NS_LITERAL_CSTRING(OS_TARGET));
#ifdef TARGET_OS_ABI
dir->Clone(getter_AddRefs(platformABIDir));
platformABIDir->AppendNative(NS_LITERAL_CSTRING("platform"));
platformABIDir->AppendNative(NS_LITERAL_CSTRING(TARGET_OS_ABI));
#endif
const char* const* a = aAppendList;
while (*a) {
dir->AppendNative(nsDependentCString(*a));
platformDir->AppendNative(nsDependentCString(*a));
#ifdef TARGET_OS_ABI
platformABIDir->AppendNative(nsDependentCString(*a));
#endif
++a;
}
@@ -414,6 +433,16 @@ LoadDirsIntoArray(nsIFile* aComponentsList, const char* aSection,
rv = dir->Exists(&exists);
if (NS_SUCCEEDED(rv) && exists)
aDirectories.AppendObject(dir);
rv = platformDir->Exists(&exists);
if (NS_SUCCEEDED(rv) && exists)
aDirectories.AppendObject(platformDir);
#ifdef TARGET_OS_ABI
rv = platformABIDir->Exists(&exists);
if (NS_SUCCEEDED(rv) && exists)
aDirectories.AppendObject(platformABIDir);
#endif
}
while (PR_TRUE);
}