suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define-runtime-path: add support for version search to 'so form

Browse Source 
Merge to v6.0
(cherry picked from commit c7d4b7d388)
This commit is contained in:
Matthew Flatt 2013-11-22 07:26:13 -07:00 committed by Ryan Culpepper
parent 4f4e65e194
commit 44c29dfb6c
4 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/racket-pkgs/racket-doc/scribblings/reference/filesystem.scrbl
View File

@ -568,7 +568,7 @@ Uses @racket[expr] as both a compile-time (i.e., @tech{phase} 1)
expression and a run-time (i.e., @tech{phase} 0) expression. In either expression and a run-time (i.e., @tech{phase} 0) expression. In either
context, @racket[expr] should produce a path, a string that represents context, @racket[expr] should produce a path, a string that represents
a path, a list of the form @racket[(list 'lib _str ...+)], or a list a path, a list of the form @racket[(list 'lib _str ...+)], or a list
of the form @racket[(list 'so _str)]. of the form @racket[(list 'so _str)] or @racket[(list 'so _str _vers)].
For run time, @racket[id] is bound to a path that is based on the For run time, @racket[id] is bound to a path that is based on the
result of @racket[expr]. The path is normally computed by taking a result of @racket[expr]. The path is normally computed by taking a
@ -588,18 +588,25 @@ If @racket[expr] produces a list of the form @racket[(list 'lib _str
refers to a collection-based file similar to using the value as a refers to a collection-based file similar to using the value as a
@tech{module path}. @tech{module path}.
If @racket[expr] produces a list of the form @racket[(list 'so _str)], If @racket[expr] produces a list of the form @racket[(list 'so _str)]
or @racket[(list 'so _str _vers)],
the value bound to @racket[id] can be either @racket[_str] or an the value bound to @racket[id] can be either @racket[_str] or an
absolute path; it is an absolute path when adding the absolute path; it is an absolute path when searching in the
platform-specific shared-library extension --- as produced by
@racket[(system-type 'so-suffix)] --- and then searching in the
Racket-specific shared-object library directories (as determined by Racket-specific shared-object library directories (as determined by
@racket[get-lib-search-dirs]) locates the path. In this way, shared-object @racket[get-lib-search-dirs]) locates the path. In this way, shared-object
libraries that are installed specifically for Racket get carried libraries that are installed specifically for Racket get carried
along in distributions. along in distributions. The search tries using @racket[_str] directly,
then it tries adding each version specified by @racket[_vers]---which defaults
to @racket['(#f)]---along with
a platform-specific shared-library extension---as produced by
@racket[(system-type 'so-suffix)]. A @racket[_vers]
can be a string, or it can be a list of strings and @racket[#f]; in the
latter case, the versions are tried in order, where @racket[#f] omits
the addition of the version.
If @racket[expr] produces a list of the form @racket[(list 'module If @racket[expr] produces a list of the form @racket[(list 'module
_module-path _var-ref)], the value bound to @racket[id] is a _module-path _var-ref)] or @racket[(list 'so _str (list
_str-or-false ...))], the value bound to @racket[id] is a
@tech{module path index}, where @racket[_module-path] is treated as @tech{module path index}, where @racket[_module-path] is treated as
relative (if it is relative) to the module that is the home of the relative (if it is relative) to the module that is the home of the
@tech{variable reference} @racket[_var-ref], where @racket[_var-ref] @tech{variable reference} @racket[_var-ref], where @racket[_var-ref]

27
racket/collects/compiler/embed.rkt
View File

@ -1131,20 +1131,31 @@
p))) p)))
(let ([p (cond (let ([p (cond
[(bytes? p) (bytes->path p)] [(bytes? p) (bytes->path p)]
[(and (list? p) (= 2 (length p)) [(and (list? p)
(or (= 2 (length p))
(= 3 (length p)))
(eq? 'so (car p))) (eq? 'so (car p)))
(let ([fs (list (ormap (lambda (vers)
(cadr p) (let ([f (if (eq? vers 'no-suffix)
(path-extra-suffix (cadr p) (cadr p)
(system-type 'so-suffix)))]) (path-extra-suffix
(ormap (lambda (f) (cadr p)
(if (string? vers)
(bytes-append #"."
(string->bytes/utf-8 vers)
(system-type 'so-suffix))
(system-type 'so-suffix))))])
(ormap (lambda (p) (ormap (lambda (p)
(let ([p (build-path p f)]) (let ([p (build-path p f)])
(and (or (file-exists? p) (and (or (file-exists? p)
(directory-exists? p)) (directory-exists? p))
p))) p)))
(get-lib-search-dirs))) (get-lib-search-dirs))))
fs))] (cons 'no-suffix
(if (= (length p) 3)
(let ([s (caddr p)])
(if (list? s) s (list s)))
'(#f))))]
[(and (list? p) [(and (list? p)
(eq? 'lib (car p))) (eq? 'lib (car p)))
(let ([p (if (null? (cddr p)) (let ([p (if (null? (cddr p))

2
racket/collects/db/private/sqlite3/ffi.rkt
View File

@ -11,7 +11,7 @@
(define-runtime-path sqlite-so (define-runtime-path sqlite-so
(case (system-type) (case (system-type)
[(windows) '(so "sqlite3")] [(windows) '(so "sqlite3")]
[else '(so "libsqlite3")])) [else '(so "libsqlite3" ("0" #f))]))
(define sqlite-lib (define sqlite-lib
(case (system-type) (case (system-type)

43
racket/collects/racket/runtime-path.rkt
View File

@ -96,16 +96,41 @@
[(string? p) (string->path p)] [(string? p) (string->path p)]
[(path? p) p] [(path? p) p]
[(and (list? p) [(and (list? p)
(= 2 (length p)) (or (= 2 (length p))
(= 3 (length p)))
(eq? 'so (car p)) (eq? 'so (car p))
(string? (cadr p))) (string? (cadr p))
(let ([f (path-replace-suffix (cadr p) (system-type 'so-suffix))]) (or (= 2 (length p))
(or (ormap (lambda (p) (let ([s (caddr p)])
(let ([p (build-path p f)]) (define (vers? s) (or (not s) (string? s)))
(and (file-exists? p) (or (vers? s)
p))) (and (list? s) (andmap vers? s))))))
(get-lib-search-dirs)) (or (ormap (lambda (vers)
(cadr p)))] (define (path-extra-suffix p sfx)
(let-values ([(base name dir?) (split-path p)])
(let ([name (bytes->path (bytes-append (path->bytes name) sfx))])
(if (path? base)
(build-path base name)
name))))
(let ([f (if (eq? vers 'no-suffix)
(cadr p)
(path-extra-suffix (cadr p)
(if vers
(bytes-append #"."
(string->bytes/utf-8 vers)
(system-type 'so-suffix))
(system-type 'so-suffix))))])
(ormap (lambda (p)
(let ([p (build-path p f)])
(and (file-exists? p)
p)))
(get-lib-search-dirs))))
(cons 'no-suffix
(if (= (length p) 3)
(let ([s (caddr p)])
(if (list? s) s (list s)))
'(#f))))
(cadr p))]
[(and (list? p) [(and (list? p)
((length p) . > . 1) ((length p) . > . 1)
(eq? 'lib (car p)) (eq? 'lib (car p))