Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jamfile changes to make <build>mimeset pick up headers/build/os/storage/AppFileInfo.h rather than the one in /boot/develop/headers on a BeOS-compatible host. This enables use of BAppFileInfo::Get/SetCatalogEntry() in <build>mimeset. Thanks Ingo!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40888 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström 2011-03-09 13:18:34 +00:00
parent e680f0fa21
commit 212e4c4243
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/build/libbe/storage/mime/UpdateMimeInfoThread.cpp
View File

@ -269,9 +269,6 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
if (err != B_OK) if (err != B_OK)
return err; return err;
/* TODO: figure out why this doesn't compile here
when the same code works in src/servers/registrar/mime
// catalog entry // catalog entry
char catalogEntry[B_MIME_TYPE_LENGTH * 3]; char catalogEntry[B_MIME_TYPE_LENGTH * 3];
err = appFileInfoRead.GetCatalogEntry(catalogEntry); err = appFileInfoRead.GetCatalogEntry(catalogEntry);
@ -281,7 +278,7 @@ UpdateMimeInfoThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir)
err = appFileInfoWrite.SetCatalogEntry(NULL); err = appFileInfoWrite.SetCatalogEntry(NULL);
if (err != B_OK) if (err != B_OK)
return err; return err;
*/
// app flags // app flags
uint32 appFlags; uint32 appFlags;
err = appFileInfoRead.GetAppFlags(&appFlags); err = appFileInfoRead.GetAppFlags(&appFlags);

19
src/tools/Jamfile
View File

@ -58,15 +58,32 @@ BuildPlatformMain <build>listattr : listattr.cpp : $(HOST_LIBBE) ;
if $(HOST_PLATFORM_BEOS_COMPATIBLE) { if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
AddResources <build>mimeset : mimeset.rdef ; AddResources <build>mimeset : mimeset.rdef ;
} }
BuildPlatformMain <build>mimeset :
local mimesetSources =
mimeset.cpp mimeset.cpp
Mime.cpp Mime.cpp
database_support.cpp database_support.cpp
UpdateMimeInfoThread.cpp UpdateMimeInfoThread.cpp
MimeUpdateThread.cpp MimeUpdateThread.cpp
;
if $(HOST_PLATFORM) = haiku_host {
mimesetSources += AppFileInfo.cpp ;
}
BuildPlatformMain <build>mimeset :
$(mimesetSources)
: $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) $(libHaikuCompat) : $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) $(libHaikuCompat)
; ;
if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
SEARCH on [ FGristFiles AppFileInfo.cpp ]
= [ FDirName $(HAIKU_TOP) src build libbe storage ] ;
SourceSysHdrs AppFileInfo.cpp UpdateMimeInfoThread.cpp
: [ FDirName $(HAIKU_TOP) headers build os storage ] ;
}
BuildPlatformMain <build>mkindex : mkindex.cpp : $(HOST_LIBBE) ; BuildPlatformMain <build>mkindex : mkindex.cpp : $(HOST_LIBBE) ;
# We want rm_attrs to be self-contained, so we link against the static libroot. # We want rm_attrs to be self-contained, so we link against the static libroot.