Small adjustments for native Mac bundle.

Works fine, but porting all the helpers to work from the bundle would be a
lot of work. All must be changed to find their resources inside the .app
Proof of concept done with antiword. Does not make sense to ship without
at least poppler (and maybe unrtf, mutagen, exiftool).
This commit is contained in:
Jean-Francois Dockes 2021-02-03 09:52:18 +01:00
parent 2d90b80bb5
commit c534afede0
3 changed files with 10 additions and 3 deletions

View File

@ -290,8 +290,12 @@ RclConfig *recollinit(int flags,
PATH = string("/usr/local/bin/") + ":" + PATH;
#else
// Native qt build. Add our own directory to the path so that
// recoll finds recollindex
// pkgdatadir: /Applications/recoll.app/Contents/Resources
// recoll finds recollindex pkgdatadir:
// /Applications/recoll.app/Contents/Resources
//
// NOTE: This does not work when running from a mounted dmg
// because the location contains colons:/Volumes/:Users:dockes:Recoll:...
// which messes with the PATH colon separators of course.
std::string exedir = path_cat(path_getfather(path_pkgdatadir()), "MacOS");
PATH = exedir + ":" + PATH;
#endif

View File

@ -167,6 +167,8 @@ mac {
-lxslt -lxml2 -liconv -lz
ICON = images/recoll.icns
system(cp ../sampleconf/mimeview.mac ../mimeview)
APP_EXAMPLES.files = \
../sampleconf/fragbuts.xml \
@ -177,7 +179,7 @@ mac {
../sampleconf/recoll-dark.qss \
../sampleconf/recoll-dark.css \
../sampleconf/mimemap \
../sampleconf/mimeview
../mimeview
APP_EXAMPLES.path = Contents/Resources/examples
APP_FILTERS.files = \

View File

@ -285,6 +285,7 @@ const string& path_pkgdatadir()
char *path= (char*)malloc(size+1);
_NSGetExecutablePath(path, &size);
datadir = path_cat(path_getfather(path_getfather(path)), "Resources");
free(path);
#else
// If not in environment, use the compiled-in constant.
datadir = RECOLL_DATADIR;