setup' and
compile' skip a subdirectory if it's called "doc". This
doesn't work for scribble/doc, which is a directory with code. So change the check to skip "doc" only if it's in the main plt collects tree. svn: r10488
This commit is contained in:
parent
7fa06be28d
commit
8fb7e764c7
|
@ -27,7 +27,8 @@
|
|||
scheme/file
|
||||
mzlib/compile ; gets compile-file
|
||||
mzlib/cm
|
||||
setup/getinfo)
|
||||
setup/getinfo
|
||||
setup/main-collects)
|
||||
|
||||
(provide compiler@)
|
||||
|
||||
|
@ -178,17 +179,20 @@
|
|||
(when (info* 'compile-subcollections (lambda () #f))
|
||||
(printf "Warning: ignoring `compile-subcollections' entry in info ~a\n"
|
||||
dir))
|
||||
(for ([p (directory-list dir)]
|
||||
#:when (directory-exists? (build-path dir p)))
|
||||
(let ([s (path->string p)])
|
||||
;; this is the same check that setup/setup-unit is doing in
|
||||
;; `make-cc*'
|
||||
(unless (or (regexp-match? #rx"^[.]" s)
|
||||
(for ([p (directory-list dir)])
|
||||
(let ([p* (build-path dir p)]
|
||||
[s (path->string p)])
|
||||
(when (and
|
||||
(directory-exists? p*)
|
||||
(not
|
||||
;; this is the same check that setup/setup-unit is
|
||||
;; doing in `make-cc*'
|
||||
(or (regexp-match? #rx"^[.]" s)
|
||||
(equal? "compiled" s)
|
||||
(equal? "doc" s)
|
||||
(and (pair? omit-paths) (member s omit-paths)))
|
||||
(let ([p (build-path dir p)])
|
||||
(compile-directory p (get-info/full p)))))))))
|
||||
(and (equal? "doc" s)
|
||||
(not (pair? (path->main-collects-relative p*))))
|
||||
(and (pair? omit-paths) (member s omit-paths)))))
|
||||
(compile-directory p* (get-info/full p*))))))))
|
||||
|
||||
(define (compile-collection-zos collection . cp)
|
||||
(compile-directory (apply collection-path collection cp)
|
||||
|
|
|
@ -191,9 +191,10 @@
|
|||
"ignoring `compile-subcollections' entry in info ~a\n"
|
||||
path-name))
|
||||
;; this check is also done in compiler/compiler-unit, in compile-directory
|
||||
(and (not (or (regexp-match? #rx"^[.]" basename)
|
||||
(and (not (or (regexp-match? #rx"^[.]" basename)
|
||||
(equal? "compiled" basename)
|
||||
(equal? "doc" basename)
|
||||
(and (equal? "doc" basename)
|
||||
(not (pair? (path->main-collects-relative path))))
|
||||
(eq? 'all (info 'compile-omit-paths void))))
|
||||
(make-cc collection path
|
||||
(if name (string-append path-name " (" name ")") path-name)
|
||||
|
|
Loading…
Reference in New Issue
Block a user