wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 951838 - Add OS.Constants.Path.libSqlite3. r=khuey

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2014-01-21 11:29:29 -05:00
parent 2bb95c6160
commit 326b2cb56c
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dom/system/OSFileConstants.cpp
View File

@ -829,22 +829,21 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle<JSObject*> global)
// Locate libxul // Locate libxul
// Note that we don't actually provide the full path, only the name of the // Note that we don't actually provide the full path, only the name of the
// library, which is sufficient to link to the library using js-ctypes. // library, which is sufficient to link to the library using js-ctypes.
{
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
// Under MacOS X, for some reason, libxul is called simply "XUL" // Under MacOS X, for some reason, libxul is called simply "XUL"
nsAutoString xulPath(NS_LITERAL_STRING("XUL")); nsAutoString libxul(NS_LITERAL_STRING("XUL"));
#else #else
// On other platforms, libxul is a library "xul" with regular // On other platforms, libxul is a library "xul" with regular
// library prefix/suffix // library prefix/suffix
nsAutoString xulPath; nsAutoString libxul;
xulPath.Append(NS_LITERAL_STRING(DLL_PREFIX)); libxul.Append(NS_LITERAL_STRING(DLL_PREFIX));
xulPath.Append(NS_LITERAL_STRING("xul")); libxul.Append(NS_LITERAL_STRING("xul"));
xulPath.Append(NS_LITERAL_STRING(DLL_SUFFIX)); libxul.Append(NS_LITERAL_STRING(DLL_SUFFIX));
#endif // defined(XP_MACOSX) #endif // defined(XP_MACOSX)
if (!SetStringProperty(cx, objPath, "libxul", xulPath)) { if (!SetStringProperty(cx, objPath, "libxul", libxul)) {
return false; return false;
}
} }
if (!SetStringProperty(cx, objPath, "libDir", gPaths->libDir)) { if (!SetStringProperty(cx, objPath, "libDir", gPaths->libDir)) {
@ -899,6 +898,27 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle<JSObject*> global)
} }
#endif // defined(XP_MACOSX) #endif // defined(XP_MACOSX)
// sqlite3 is linked from different places depending on the platform
nsAutoString libsqlite3;
#if defined(ANDROID)
// On Android, we use the system's libsqlite3
libsqlite3.Append(NS_LITERAL_STRING(DLL_PREFIX));
libsqlite3.Append(NS_LITERAL_STRING("sqlite3"));
libsqlite3.Append(NS_LITERAL_STRING(DLL_SUFFIX));
#elif defined(XP_WIN)
// On Windows, for some reason, this is part of nss3.dll
libsqlite3.Append(NS_LITERAL_STRING(DLL_PREFIX));
libsqlite3.Append(NS_LITERAL_STRING("nss3"));
libsqlite3.Append(NS_LITERAL_STRING(DLL_SUFFIX));
#else
// On other platforms, we link sqlite3 into libxul
libsqlite3 = libxul;
#endif // defined(ANDROID) || defined(XP_WIN)
if (!SetStringProperty(cx, objPath, "libsqlite3", libsqlite3)) {
return false;
}
return true; return true;
} }