change define-requirer to use library paths to fix build

svn: r15041
This commit is contained in:
Sam Tobin-Hochstadt 2009-06-01 17:15:22 +00:00
parent fc1dd569e2
commit a255514ba1

View File

@ -5,7 +5,7 @@ This file is for utilities that are of general interest,
at least theoretically. at least theoretically.
|# |#
(require (for-syntax scheme/base stxclass) (require (for-syntax scheme/base stxclass scheme/string)
scheme/contract mzlib/plt-match scheme/require-syntax scheme/provide-syntax scheme/contract mzlib/plt-match scheme/require-syntax scheme/provide-syntax
mzlib/struct scheme/unit mzlib/struct scheme/unit
(except-in stxclass id)) (except-in stxclass id))
@ -38,15 +38,15 @@ at least theoretically.
(map (lambda (id) (map (lambda (id)
(datum->syntax (datum->syntax
id id
`(file `(lib
,(datum->syntax ,(datum->syntax
#f #f
(path->string (string-join
(build-path (collection-path "typed-scheme" (list "typed-scheme"
#,(symbol->string (syntax-e #'nm))) (symbol->string (syntax-e #'nm))
(string-append (symbol->string (syntax-e id)) (string-append (symbol->string (syntax-e id)) ".ss"))
".ss"))) "/")
id id)) id id))
id id)) id id))
(syntax->list #'(id ...)))]) (syntax->list #'(id ...)))])
(syntax-property (syntax/loc stx (combine-in id* ...)) (syntax-property (syntax/loc stx (combine-in id* ...))
@ -59,13 +59,15 @@ at least theoretically.
(map (lambda (id) (map (lambda (id)
(datum->syntax (datum->syntax
id id
`(file `(lib
,(path->string ,(datum->syntax
(build-path (collection-path "typed-scheme" #f
#,(symbol->string (syntax-e #'nm))) (string-join
(string-append (symbol->string (syntax-e id)) (list "typed-scheme"
".ss")))) (symbol->string (syntax-e #'nm))
id id)) (string-append (symbol->string (syntax-e id)) ".ss"))
"/")
id id))))
(syntax->list #'(id ...)))]) (syntax->list #'(id ...)))])
(syntax/loc stx (combine-out (all-from-out id*) ...)))])) (syntax/loc stx (combine-out (all-from-out id*) ...)))]))
(provide nm nm-out)))])) (provide nm nm-out)))]))