no more PLTHOME anywhere; instead, there's a dir.ss library to find various directories

svn: r2924

original commit: 8ed6d36b33cdfd9d2e3ed4dc8e77aa3e98073eb0
This commit is contained in:
Matthew Flatt 2006-05-12 21:14:02 +00:00
parent d23061ed05
commit a292daf470
2 changed files with 11 additions and 10 deletions

View File

@ -1,6 +1,6 @@
(module cm mzscheme
(require (lib "moddep.ss" "syntax")
(lib "plthome.ss" "setup")
(lib "main-collects.ss" "setup")
(lib "file.ss"))
(provide make-compilation-manager-load/use-compiled-handler
@ -15,7 +15,8 @@
(define indent (make-parameter ""))
(define trust-existing-zos (make-parameter #f))
(define (trace-printf fmt . args) ((trace) (string-append (indent) (apply format fmt args))))
(define (trace-printf fmt . args)
((trace) (string-append (indent) (apply format fmt args))))
(define my-max
(case-lambda
@ -88,8 +89,8 @@
dep-path
(lambda (op)
(write (cons (version)
(append (map plthome-ify deps)
(map (lambda (x) (plthome-ify (cons 'ext x)))
(append (map path->main-collects-relative deps)
(map (lambda (x) (path->main-collects-relative (cons 'ext x)))
external-deps)))
op)
(newline op)))))
@ -252,7 +253,7 @@
(when (> t path-zo-time)
(trace-printf "newer: ~a (~a > ~a)..." d t path-zo-time))
(> t path-zo-time)))
(map un-plthome-ify (cdr deps)))
(map main-collects-relative->path (cdr deps)))
(compile-zo mode path))))))
(let ((stamp (get-compiled-time mode path #t)))
(hash-table-put! up-to-date path stamp)

View File

@ -2,13 +2,13 @@
(module etc mzscheme
(require "spidey.ss"
(lib "plthome.ss" "setup"))
(lib "main-collects.ss" "setup"))
(require-for-syntax (lib "kerncase.ss" "syntax")
(lib "stx.ss" "syntax")
(lib "name.ss" "syntax")
(lib "context.ss" "syntax")
(lib "plthome.ss" "setup")
(lib "main-collects.ss" "setup")
"list.ss"
"private/stxset.ss")
@ -452,15 +452,15 @@
(let* ([source (syntax-source stx)]
[source (and (path? source) source)]
[local (or (current-load-relative-directory) (current-directory))]
[dir (plthome-ify
[dir (path->main-collects-relative
(or (and source (file-exists? source)
(let-values ([(base file dir?) (split-path source)])
(and (path? base)
(path->complete-path base local))))
local))])
(if (and (pair? dir) (eq? 'plthome (car dir)))
(if (and (pair? dir) (eq? 'collects (car dir)))
(with-syntax ([d dir])
#'(un-plthome-ify 'd))
#'(main-collects-relative->path 'd))
(with-syntax ([d (if (bytes? dir) dir (path->bytes dir))])
#'(bytes->path d))))]))