steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alien.libraries.finder: better library resolving

db4
Björn Lindqvist 2013-11-08 16:49:34 +01:00
parent 0236212987
commit 29ad75a85d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/alien/libraries/finder/finder.factor
View File

@ -4,6 +4,7 @@ USING:
assocs assocs
combinators combinators
formatting formatting
fry
io io.encodings.utf8 io.launcher io.pathnames io io.encodings.utf8 io.launcher io.pathnames
kernel kernel
sequences sequences
@ -16,23 +17,17 @@ IN: alien.libraries.finder
[ 1array ] dip vsprintf ; [ 1array ] dip vsprintf ;
CONSTANT: name-formats { CONSTANT: name-formats {
{ windows { "lib%s.dll" "%s.dll" } } { windows { "%s.dll" "lib%s.dll" } }
{ linux { "lib%s.so" } } { linux { "lib%s.so" } }
{ unix { "lib%s.so" } } { unix { "lib%s.so" } }
{ macosx { "lib%s.0.dylib" } } { macosx { "lib%s.dylib" } }
} }
! On Windows, bundled dlls are shipped in a directory named "dlls" in ! On Windows, bundled dlls are shipped in a directory named "dlls" in
! the Factor distribution. On other operating systems, the dynamic ! the Factor distribution. On other operating systems, the dynamic
! linker can itself figure out where libraries are located. ! linker can itself figure out where libraries are located.
CONSTANT: search-paths {
{ windows { "" "dlls" } }
{ unix { "" } }
{ macosx { "" } }
}
: path-formats ( -- path-formats ) : path-formats ( -- path-formats )
search-paths name-formats [ os of ] bi@ { "" } os windows? [ "dlls" suffix ] when name-formats os of
[ append-path ] cartesian-map concat ; [ append-path ] cartesian-map concat ;
! Find lib using ldconfig ! Find lib using ldconfig
@ -53,14 +48,11 @@ CONSTANT: mach-map {
[ start 0 = ] [ ldconfig-filter = ] bi* and ; [ start 0 = ] [ ldconfig-filter = ] bi* and ;
: ldconfig-find-soname ( lib -- seq ) : ldconfig-find-soname ( lib -- seq )
name-formats os of first vsprintf1
ldconfig-cache [ first2 ldconfig-matches? ] with filter [ first ] map ; ldconfig-cache [ first2 ldconfig-matches? ] with filter [ first ] map ;
: candidate-paths ( name -- paths ) : candidate-paths ( name -- paths )
{ path-formats [ vsprintf1 ] with map
{ [ os windows? ] [ path-formats [ vsprintf1 ] with map ] } os [ unix? ] [ linux? ] bi or [ first ldconfig-find-soname ] when ;
{ [ os linux? ] [ ldconfig-find-soname ] }
} cond ;
: find-library ( name -- path/f ) : find-library ( name -- path/f )
candidate-paths [ dlopen dll-valid? ] map-find nip ; candidate-paths [ dlopen dll-valid? ] map-find nip ;