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

Revert "alien.libraries: dlopen should handle resource:-paths" 

This reverts commit cc663fff88fa7321af6deea424890128d3b0bc07.

Conflicts:
	basis/alien/libraries/libraries-tests.factor
db4
John Benediktsson 2013-12-20 21:07:31 -08:00
parent d23cb84ad4
commit 351d68b1e1
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basis/alien/libraries/libraries-tests.factor
View File

@ -1,5 +1,4 @@
USING: alien alien.libraries alien.syntax formatting io.pathnames USING: alien alien.libraries alien.syntax tools.test kernel ;
kernel system tools.test ;
IN: alien.libraries.tests IN: alien.libraries.tests
[ f ] [ DLL" fadfasdfsada" dll-valid? ] unit-test [ f ] [ DLL" fadfasdfsada" dll-valid? ] unit-test
@ -27,10 +26,3 @@ IN: alien.libraries.tests
"test-library" "blah" cdecl add-library? "test-library" "blah" cdecl add-library?
"blah" remove-library "blah" remove-library
] unit-test ] unit-test
! dlopen resolves resource:-paths
os windows? [
[ t ] [
vm file-stem "resource:/%s.exe" sprintf dlopen dll-valid?
] unit-test
] when

2
basis/alien/libraries/libraries.factor
View File

@ -5,7 +5,7 @@ kernel namespaces destructors sequences strings
system io.pathnames fry combinators vocabs ; system io.pathnames fry combinators vocabs ;
IN: alien.libraries IN: alien.libraries
: dlopen ( path -- dll ) absolute-path native-string>alien (dlopen) ; : dlopen ( path -- dll ) native-string>alien (dlopen) ;
: dlsym ( name dll -- alien ) [ string>symbol ] dip (dlsym) ; : dlsym ( name dll -- alien ) [ string>symbol ] dip (dlsym) ;