* Improved code in setup/scribble

* Made it avoid user mannuals if -U is specified

svn: r8787
This commit is contained in:
Eli Barzilay 2008-02-25 00:00:13 +00:00
parent bb34f747b6
commit c71f59b2f8
2 changed files with 294 additions and 328 deletions

View File

@ -3,11 +3,11 @@
(require "getinfo.ss" (require "getinfo.ss"
"dirs.ss" "dirs.ss"
"private/doc-path.ss" "private/doc-path.ss"
"main-collects.ss"
scheme/class scheme/class
scheme/file scheme/file
scheme/fasl scheme/fasl
scheme/serialize scheme/serialize
setup/main-collects
scribble/base-render scribble/base-render
scribble/struct scribble/struct
scribble/manual ; really shouldn't be here... see dynamic-require-doc scribble/manual ; really shouldn't be here... see dynamic-require-doc
@ -20,8 +20,8 @@
(define verbose (make-parameter #t)) (define verbose (make-parameter #t))
(define-struct doc (src-dir src-file dest-dir flags under-main? category)) (define-struct doc (src-dir src-file dest-dir flags under-main? category))
(define-struct info (doc sci provides undef searches deps (define-struct info (doc sci provides undef searches deps
build? time out-time need-run? build? time out-time need-run?
need-in-write? need-out-write? need-in-write? need-out-write?
vers rendered? failed?) vers rendered? failed?)
#:mutable) #:mutable)
@ -30,252 +30,215 @@
(or (memq 'user-doc-root (doc-flags doc)) (or (memq 'user-doc-root (doc-flags doc))
(memq 'user-doc (doc-flags doc)))) (memq 'user-doc (doc-flags doc))))
(define (filter-user-start docs) (define (filter-user-docs docs make-user?)
;; If we've built user-specific before... (define (filtered) (filter (lambda (doc) (not (user-doc? doc))) docs))
(if (file-exists? (build-path (find-user-doc-dir) "index.html")) (cond ;; Specifically disabled user stuff, filter
;; Keep building: [(not make-user?) (filtered)]
docs ;; If we've built user-specific before, keep building
;; Otherwise, see if we need it: [(file-exists? (build-path (find-user-doc-dir) "index.html")) docs]
(let ([cnt-not-main (apply + ;; Otherwise, see if we need it:
(map (lambda (doc) [(ormap (lambda (doc)
(if (or (doc-under-main? doc) (not (or (doc-under-main? doc)
(memq 'no-depend-on (doc-flags doc))) (memq 'no-depend-on (doc-flags doc)))))
0 docs)
1)) docs]
docs))]) [else (filtered)])) ; Don't need them, so drop them
(let ([any-not-main? (positive? cnt-not-main)])
(cond
[any-not-main?
;; Need user-specific:
docs]
[else
;; Don't need them, so drop them:
(filter (lambda (doc) (not (user-doc? doc)))
docs)])))))
(define (setup-scribblings only-dirs ; limits doc builds (define (setup-scribblings
latex-dest ; if not #f, generate Latex output only-dirs ; limits doc builds
auto-start-doc? ; if #t, expands `only-dir' with [user-]start to catch new docs latex-dest ; if not #f, generate Latex output
with-record-error) ; catch & record exceptions auto-start-doc? ; if #t, expands `only-dir' with [user-]start to
(let* ([dirs (find-relevant-directories '(scribblings))] ; catch new docs
[infos (map get-info/full dirs)] make-user? ; are we making user stuff?
[docs (map (lambda (i dir) with-record-error) ; catch & record exceptions
(let ([s (i 'scribblings)]) (define (scribblings-flag? sym)
(if (and (list? s) (memq sym '(main-doc main-doc-root user-doc-root user-doc multi-page
(andmap (lambda (v) depends-all depends-all-main no-depend-on always-run)))
(and (list? v) (define (validate-scribblings-infos infos dir)
(<= 1 (length v) 3) (define (validate path [flags '()] [name #f])
(string? (car v)) (and (string? path) (relative-path? path)
(relative-path? (car v)) (list? flags) (andmap scribblings-flag? flags)
(or (null? (cdr v)) (or (not name) (and (path-string? name) (relative-path? name) name))
(and (list? (cadr v)) (list path flags
(andmap (lambda (i) (or name (let-values ([(_1 name _2) (split-path path)])
(member i '(main-doc (path-replace-suffix name #""))))))
main-doc-root (and (list? infos)
user-doc-root (let ([infos (map (lambda (i)
user-doc (and (list? i) (<= 1 (length i) 3)
multi-page (apply validate i)))
depends-all infos)])
depends-all-main (and (not (memq #f infos)) infos))))
no-depend-on (define (get-docs i dir)
always-run))) (let ([s (validate-scribblings-infos (i 'scribblings) dir)])
(cadr v)) (if s
(or (null? (cddr v)) (map (lambda (d cat)
(and (path-string? (caddr v)) (let* ([flags (cadr d)]
(relative-path? (caddr v)))))))) [under-main?
s)) (and (not (memq 'main-doc-root flags))
(map (lambda (d cat) (not (memq 'user-doc-root flags))
(let* ([flags (if (pair? (cdr d)) (cadr d) null)] (not (memq 'user-doc flags))
[under-main? (and (not (memq 'main-doc-root flags)) (or (memq 'main-doc flags)
(not (memq 'user-doc-root flags)) (pair? (path->main-collects-relative dir))))])
(not (memq 'user-doc flags)) (make-doc dir
(or (memq 'main-doc flags) (build-path dir (car d))
(pair? (path->main-collects-relative dir))))]) (doc-path dir (caddr d) flags)
(make-doc dir flags under-main? cat)))
(build-path dir (car d)) s
(let ([name (if (and (pair? (cdr d)) (i 'doc-categories (lambda () (map (lambda (a) 'library) s))))
(pair? (cddr d)) (begin (fprintf (current-error-port)
(caddr d)) " bad 'scribblings info: ~e from: ~e\n" s dir)
(cadr d) null))))
(let-values ([(base name dir?) (split-path (car d))]) (define docs
(path-replace-suffix name #"")))]) (let* ([dirs (find-relevant-directories '(scribblings))]
(doc-path dir name flags)) [infos (map get-info/full dirs)])
flags (filter-user-docs (apply append (map get-docs infos dirs)) make-user?)))
under-main? (define main-docs (filter doc-under-main? docs))
cat))) (define user-docs (filter (lambda (d) (not (doc-under-main? d))) docs))
s (define (can-build*? docs) (can-build? only-dirs docs))
(i 'doc-categories (lambda () (map (lambda (a) 'library) s)))) (define auto-main? (and auto-start-doc? (ormap can-build*? main-docs)))
(begin (define auto-user? (and auto-start-doc? (ormap can-build*? user-docs)))
(fprintf (current-error-port) (define infos
" bad 'scribblings info: ~e from: ~e\n" (and (ormap can-build*? docs)
s (filter values
dir) (map (get-doc-info only-dirs latex-dest auto-main? auto-user?
null)))) with-record-error)
infos dirs)] docs))))
[docs (filter-user-start (apply append docs))]) (define (make-loop first? iter)
(when (ormap (can-build? only-dirs) docs) (let ([ht (make-hash-table 'equal)]
(let* ([auto-main? (and auto-start-doc? [infos (filter (lambda (i) (not (info-failed? i))) infos)]
(ormap (can-build? only-dirs) [src->info (make-hash-table 'equal)])
(filter doc-under-main? docs)))] ;; Collect definitions
[auto-user? (and auto-start-doc? (for* ([info infos]
(ormap (can-build? only-dirs) [k (info-provides info)])
(filter (lambda (doc) (not (doc-under-main? doc))) (let ([prev (hash-table-get ht k #f)])
docs)))] (when (and first? prev)
[infos (filter values (map (get-doc-info only-dirs latex-dest (fprintf (current-error-port)
auto-main? auto-user? with-record-error) "DUPLICATE tag: ~s\n in: ~a\n and: ~a\n"
docs))]) k
(let loop ([first? #t] [iter 0]) (doc-src-file (info-doc prev))
(let ([ht (make-hash-table 'equal)] (doc-src-file (info-doc info))))
[infos (filter (lambda (i) (hash-table-put! ht k info)))
(not (info-failed? i))) ;; Build deps:
infos)]) (for ([i infos])
;; Collect definitions (hash-table-put! src->info (doc-src-file (info-doc i)) i))
(for* ([info infos] (for ([info infos] #:when (info-build? info))
[k (info-provides info)]) (let ([one? #f]
(let ([prev (hash-table-get ht k #f)]) [added? #f]
(when (and first? prev) [deps (make-hash-table)]
(fprintf (current-error-port) [all-main? (memq 'depends-all-main (doc-flags (info-doc info)))])
"DUPLICATE tag: ~s\n in: ~a\n and: ~a\n" (set-info-deps!
k info
(doc-src-file (info-doc prev)) (map (lambda (d)
(doc-src-file (info-doc info)))) (if (info? d) d (or (hash-table-get src->info d #f) d)))
(hash-table-put! ht k info))) (info-deps info)))
;; Build deps: (for ([d (info-deps info)])
(let ([src->info (make-hash-table 'equal)]) (let ([i (if (info? d) d (hash-table-get src->info d #f))])
(for ([i infos]) (if i
(hash-table-put! src->info (doc-src-file (info-doc i)) i)) (hash-table-put! deps i #t)
(for ([info infos] (unless
#:when (info-build? info)) (or (memq 'depends-all (doc-flags (info-doc info)))
(let ([one? #f] (and (if (info? d)
[added? #f] (doc-under-main? (info-doc d))
[deps (make-hash-table)]) (not (path? (path->main-collects-relative d))))
(set-info-deps! all-main?))
info (set! added? #t)
(map (lambda (d)
(if (info? d)
d
(or (hash-table-get src->info d #f)
d)))
(info-deps info)))
(for ([d (info-deps info)])
(let ([i (if (info? d)
d
(hash-table-get src->info d #f))])
(if i
(hash-table-put! deps i #t)
(unless (or (memq 'depends-all (doc-flags (info-doc info)))
(and (if (info? d)
(doc-under-main? (info-doc d))
(not (path? (path->main-collects-relative d))))
(memq 'depends-all-main (doc-flags (info-doc info)))))
(set! added? #t)
(when (verbose)
(printf " [Removed Dependency: ~a]\n"
(doc-src-file (info-doc info))))))))
(let ([all-main? (memq 'depends-all-main (doc-flags (info-doc info)))])
(when (or (memq 'depends-all (doc-flags (info-doc info)))
all-main?)
;; Add all:
(when (verbose)
(printf " [Adding all~a as dependencies: ~a]\n"
(if all-main? " main" "")
(doc-src-file (info-doc info))))
(for ([i infos])
(unless (eq? i info)
(when (not (hash-table-get deps i #f))
(when (and (or (not all-main?)
(doc-under-main? (info-doc i)))
(not (memq 'no-depend-on (doc-flags (info-doc i)))))
(set! added? #t)
(hash-table-put! deps i #t)))))))
(let ([not-found
(lambda (k)
(unless one?
(fprintf (current-error-port)
"In ~a:\n"
(doc-src-file (info-doc info)))
(set! one? #t))
(fprintf (current-error-port)
" undefined tag: ~s\n"
k))])
(for ([k (info-undef info)])
(let ([i (hash-table-get ht k #f)])
(if i
(when (not (hash-table-get deps i #f))
(set! added? #t)
(hash-table-put! deps i #t))
(when first?
(unless (eq? (car k) 'dep) (not-found k))))))
(when first?
(for ([(s-key s-ht) (info-searches info)])
(unless (ormap (lambda (k) (hash-table-get ht k #f))
(hash-table-map s-ht (lambda (k v) k)))
(not-found s-key)))))
(when added?
(when (verbose)
(printf " [Added Dependency: ~a]\n"
(doc-src-file (info-doc info))))
(set-info-deps! info (hash-table-map deps (lambda (k v) k)))
(set-info-need-in-write?! info #t)
(set-info-need-run?! info #t)))))
;; If a dependency changed, then we need a re-run:
(for ([i infos]
#:when (not (or (info-need-run? i) (not (info-build? i)))))
(let ([ch (ormap (lambda (i2)
(and (>= (info-out-time i2) (info-time i)) i2))
(info-deps i))])
(when ch
(when (verbose) (when (verbose)
(printf " [Dependency: ~a\n <- ~a]\n" (printf " [Removed Dependency: ~a]\n"
(doc-src-file (info-doc i)) (doc-src-file (info-doc info))))))))
(doc-src-file (info-doc ch)))) (when (or (memq 'depends-all (doc-flags (info-doc info))) all-main?)
(set-info-need-run?! i #t)))) ;; Add all:
;; Iterate, if any need to run: (when (verbose)
(when (and (ormap info-need-run? infos) (iter . < . 30)) (printf " [Adding all~a as dependencies: ~a]\n"
;; Build again, using dependencies (if all-main? " main" "")
(for ([i infos] #:when (info-need-run? i)) (doc-src-file (info-doc info))))
(set-info-need-run?! i #f) (for ([i infos])
(build-again! latex-dest i with-record-error)) (when (and (not (eq? i info))
(loop #f (add1 iter))))) (not (hash-table-get deps i #f))
;; cache info to disk (or (not all-main?) (doc-under-main? (info-doc i)))
(unless latex-dest (not (memq 'no-depend-on (doc-flags (info-doc i)))))
(for ([i infos] #:when (info-need-in-write? i)) (set! added? #t)
(write-in i))))))) (hash-table-put! deps i #t))))
(let ([not-found
(lambda (k)
(unless one?
(fprintf (current-error-port)
"In ~a:\n" (doc-src-file (info-doc info)))
(set! one? #t))
(fprintf (current-error-port) " undefined tag: ~s\n" k))])
(for ([k (info-undef info)])
(let ([i (hash-table-get ht k #f)])
(if i
(when (not (hash-table-get deps i #f))
(set! added? #t)
(hash-table-put! deps i #t))
(when first? (unless (eq? (car k) 'dep) (not-found k))))))
(when first?
(for ([(s-key s-ht) (info-searches info)])
(unless (ormap (lambda (k) (hash-table-get ht k #f))
(hash-table-map s-ht (lambda (k v) k)))
(not-found s-key)))))
(when added?
(when (verbose)
(printf " [Added Dependency: ~a]\n"
(doc-src-file (info-doc info))))
(set-info-deps! info (hash-table-map deps (lambda (k v) k)))
(set-info-need-in-write?! info #t)
(set-info-need-run?! info #t))))
;; If a dependency changed, then we need a re-run:
(for ([i infos]
#:when (not (or (info-need-run? i) (not (info-build? i)))))
(let ([ch (ormap (lambda (i2)
(and (>= (info-out-time i2) (info-time i)) i2))
(info-deps i))])
(when ch
(when (verbose)
(printf " [Dependency: ~a\n <- ~a]\n"
(doc-src-file (info-doc i))
(doc-src-file (info-doc ch))))
(set-info-need-run?! i #t))))
;; Iterate, if any need to run:
(when (and (ormap info-need-run? infos) (iter . < . 30))
;; Build again, using dependencies
(for ([i infos] #:when (info-need-run? i))
(set-info-need-run?! i #f)
(build-again! latex-dest i with-record-error))
(make-loop #f (add1 iter)))))
(when infos
(make-loop #t 0)
;; cache info to disk
(unless latex-dest
(for ([i infos] #:when (info-need-in-write? i)) (write-in i)))))
(define (make-renderer latex-dest doc) (define (make-renderer latex-dest doc)
(if latex-dest (if latex-dest
(new (latex:render-mixin render%) (new (latex:render-mixin render%)
[dest-dir latex-dest]) [dest-dir latex-dest])
(new ((if (memq 'multi-page (doc-flags doc)) html:render-multi-mixin values) (let ([multi? (memq 'multi-page (doc-flags doc))]
(html:render-mixin render%)) [main? (doc-under-main? doc)]
[dest-dir (if (memq 'multi-page (doc-flags doc)) [ddir (doc-dest-dir doc)])
(let-values ([(base name dir?) (split-path (doc-dest-dir doc))]) (new ((if multi? html:render-multi-mixin values)
base) (html:render-mixin render%))
(doc-dest-dir doc))] [dest-dir (if multi?
[css-path (if (doc-under-main? doc) (let-values ([(base name dir?) (split-path ddir)]) base)
"../scribble.css" ddir)]
#f)] [css-path (and main? "../scribble.css")]
[up-path (if (doc-under-main? doc) [up-path (and main? "../index.html")]))))
"../index.html"
#f)])))
(define (pick-dest latex-dest doc) (define (pick-dest latex-dest doc)
(if latex-dest (cond [latex-dest
(build-path latex-dest (let-values ([(base name dir?) (split-path (doc-src-file doc))]) (let-values ([(base name dir?) (split-path (doc-src-file doc))])
(path-replace-suffix name #".tex"))) (build-path latex-dest (path-replace-suffix name #".tex")))]
(if (memq 'multi-page (doc-flags doc)) [(memq 'multi-page (doc-flags doc)) (doc-dest-dir doc)]
(doc-dest-dir doc) [else (build-path (doc-dest-dir doc) "index.html")]))
(build-path (doc-dest-dir doc) "index.html"))))
(define ((can-build? only-dirs) doc) (define (can-build? only-dirs doc)
(or (not only-dirs) (or (not only-dirs)
(ormap (lambda (d) (ormap (lambda (d)
(let ([d (path->directory-path d)]) (let ([d (path->directory-path d)])
(let loop ([dir (path->directory-path (doc-src-dir doc))]) (let loop ([dir (path->directory-path (doc-src-dir doc))])
(or (equal? dir d) (or (equal? dir d)
(let-values ([(base name dir?) (split-path dir)]) (let-values ([(base name dir?) (split-path dir)])
(and (path? base) (and (path? base) (loop base)))))))
(loop base)))))))
only-dirs))) only-dirs)))
(define (ensure-doc-prefix v src-file) (define (ensure-doc-prefix v src-file)
@ -291,14 +254,15 @@
[tags (if (member '(part "top") (part-tags v)) [tags (if (member '(part "top") (part-tags v))
(part-tags v) (part-tags v)
(cons '(part "top") (part-tags v)))]) (cons '(part "top") (part-tags v)))])
(make-versioned-part tag-prefix (make-versioned-part
tags tag-prefix
(part-title-content v) tags
(part-style v) (part-title-content v)
(part-to-collect v) (part-style v)
(part-flow v) (part-to-collect v)
(part-parts v) (part-flow v)
(and (versioned-part? v) (versioned-part-version v)))))) (part-parts v)
(and (versioned-part? v) (versioned-part-version v))))))
(define (omit? cat) (define (omit? cat)
(or (eq? cat 'omit) (or (eq? cat 'omit)
@ -309,14 +273,16 @@
(define (read-out-sxref) (define (read-out-sxref)
(fasl->s-exp (current-input-port))) (fasl->s-exp (current-input-port)))
(define ((get-doc-info only-dirs latex-dest auto-main? auto-user? with-record-error) doc) (define ((get-doc-info only-dirs latex-dest auto-main? auto-user?
with-record-error)
doc)
(let* ([info-out-file (build-path (or latex-dest (doc-dest-dir doc)) "out.sxref")] (let* ([info-out-file (build-path (or latex-dest (doc-dest-dir doc)) "out.sxref")]
[info-in-file (build-path (or latex-dest (doc-dest-dir doc)) "in.sxref")] [info-in-file (build-path (or latex-dest (doc-dest-dir doc)) "in.sxref")]
[out-file (build-path (doc-dest-dir doc) "index.html")] [out-file (build-path (doc-dest-dir doc) "index.html")]
[src-zo (let-values ([(base name dir?) (split-path (doc-src-file doc))]) [src-zo (let-values ([(base name dir?) (split-path (doc-src-file doc))])
(build-path base "compiled" (path-add-suffix name ".zo")))] (build-path base "compiled" (path-add-suffix name ".zo")))]
[renderer (make-renderer latex-dest doc)] [renderer (make-renderer latex-dest doc)]
[can-run? ((can-build? only-dirs) doc)] [can-run? (can-build? only-dirs doc)]
[aux-time (max (file-or-directory-modify-seconds [aux-time (max (file-or-directory-modify-seconds
(build-path (collection-path "scribble") (build-path (collection-path "scribble")
"compiled" "compiled"
@ -357,43 +323,45 @@
(fprintf (current-error-port) "~a\n" (exn-message exn)) (fprintf (current-error-port) "~a\n" (exn-message exn))
(delete-file info-out-file) (delete-file info-out-file)
(delete-file info-in-file) (delete-file info-in-file)
((get-doc-info only-dirs latex-dest auto-main? auto-user? ((get-doc-info only-dirs latex-dest auto-main?
with-record-error) doc))]) auto-user? with-record-error)
doc))])
(let* ([v-in (with-input-from-file info-in-file read)] (let* ([v-in (with-input-from-file info-in-file read)]
[v-out (with-input-from-file info-out-file read-out-sxref)]) [v-out (with-input-from-file info-out-file read-out-sxref)])
(unless (and (equal? (car v-in) (list vers (doc-flags doc))) (unless (and (equal? (car v-in) (list vers (doc-flags doc)))
(equal? (car v-out) (list vers (doc-flags doc)))) (equal? (car v-out) (list vers (doc-flags doc))))
(error "old info has wrong version or flags")) (error "old info has wrong version or flags"))
(make-info doc (make-info
(list-ref v-out 1) ; sci doc
(list-ref v-out 2) ; provides (list-ref v-out 1) ; sci
(let ([v (list-ref v-in 1)]) ; undef (list-ref v-out 2) ; provides
(if (not (and (pair? v) ; temporary compatibility; used to be not serialized (let ([v (list-ref v-in 1)]) ; undef
(pair? (car v)) (if (not (and (pair? v) ; temporary compatibility; used to be not serialized
(integer? (caar v)))) (pair? (car v))
v (integer? (caar v))))
(deserialize v))) v
(let ([v (list-ref v-in 3)]) ; searches (deserialize v)))
(if (hash-table? v) ; temporary compatibility; used to be not serialized (let ([v (list-ref v-in 3)]) ; searches
v (if (hash-table? v) ; temporary compatibility; used to be not serialized
(deserialize v))) v
(map rel->path (list-ref v-in 2)) ; deps, in case we don't need to build... (deserialize v)))
can-run? (map rel->path (list-ref v-in 2)) ; deps, in case we don't need to build...
my-time info-out-time can-run?
(and can-run? my-time info-out-time
(memq 'always-run (doc-flags doc))) (and can-run? (memq 'always-run (doc-flags doc)))
#f #f #f #f
vers vers
#f #f
#f))) #f)))
(if can-run? (if can-run?
;; Run the doc once: ;; Run the doc once:
(with-record-error (with-record-error
(doc-src-file doc) (doc-src-file doc)
(lambda () (lambda ()
(parameterize ([current-directory (doc-src-dir doc)]) (parameterize ([current-directory (doc-src-dir doc)])
(let* ([v (ensure-doc-prefix (dynamic-require-doc (doc-src-file doc)) (let* ([v (ensure-doc-prefix
(doc-src-file doc))] (dynamic-require-doc (doc-src-file doc))
(doc-src-file doc))]
[dest-dir (pick-dest latex-dest doc)] [dest-dir (pick-dest latex-dest doc)]
[ci (send renderer collect (list v) (list dest-dir))] [ci (send renderer collect (list v) (list dest-dir))]
[ri (send renderer resolve (list v) (list dest-dir) ci)] [ri (send renderer resolve (list v) (list dest-dir) ci)]
@ -433,63 +401,60 @@
#f)))) #f))))
(define (build-again! latex-dest info with-record-error) (define (build-again! latex-dest info with-record-error)
(let* ([doc (info-doc info)] (define doc (info-doc info))
[renderer (make-renderer latex-dest doc)]) (define renderer (make-renderer latex-dest doc))
(printf " [R~aendering ~a]\n" (printf " [R~aendering ~a]\n" (if (info-rendered? info) "e-r" "")
(if (info-rendered? info) "e-r" "") (doc-src-file doc))
(doc-src-file doc)) (set-info-rendered?! info #t)
(set-info-rendered?! info #t) (with-record-error
(with-record-error (doc-src-file doc)
(doc-src-file doc) (lambda ()
(lambda () (parameterize ([current-directory (doc-src-dir doc)])
(parameterize ([current-directory (doc-src-dir doc)]) (let* ([v (ensure-doc-prefix (dynamic-require-doc (doc-src-file doc))
(let* ([v (ensure-doc-prefix (dynamic-require-doc (doc-src-file doc)) (doc-src-file doc))]
(doc-src-file doc))] [dest-dir (pick-dest latex-dest doc)]
[dest-dir (pick-dest latex-dest doc)] [ci (send renderer collect (list v) (list dest-dir))])
[ci (send renderer collect (list v) (list dest-dir))]) (for ([i (info-deps info)])
(for ([i (info-deps info)]) (send renderer deserialize-info (info-sci i) ci))
(send renderer deserialize-info (info-sci i) ci)) (let* ([ri (send renderer resolve (list v) (list dest-dir) ci)]
(let* ([ri (send renderer resolve (list v) (list dest-dir) ci)] [sci (send renderer serialize-info ri)]
[sci (send renderer serialize-info ri)] [defs (send renderer get-defined ci)]
[defs (send renderer get-defined ci)] [undef (send renderer get-undefined ri)]
[undef (send renderer get-undefined ri)] [in-delta? (not (equal? undef (info-undef info)))]
[in-delta? (not (equal? undef (info-undef info)))] [out-delta? (not (equal? (list sci defs)
[out-delta? (not (equal? (list sci defs) (list (info-sci info)
(list (info-sci info) (info-provides info))))])
(info-provides info))))]) (when (verbose)
(when (verbose) (printf " [~a~afor ~a]\n"
(printf " [~a~afor ~a]\n" (if in-delta? "New in " "")
(if in-delta? "New in " "") (cond [out-delta? "New out "]
(cond [out-delta? "New out "] [in-delta? ""]
[in-delta? ""] [else "No change "])
[else "No change "]) (doc-src-file doc)))
(doc-src-file doc))) (when out-delta?
(when out-delta? (set-info-out-time! info (/ (current-inexact-milliseconds) 1000)))
(set-info-out-time! info (/ (current-inexact-milliseconds) 1000))) (set-info-sci! info sci)
(set-info-sci! info sci) (set-info-provides! info defs)
(set-info-provides! info defs) (set-info-undef! info undef)
(set-info-undef! info undef) (when in-delta? (set-info-deps! info null)) ; recompute deps outside
(when in-delta? (set-info-deps! info null)) ; recompute deps outside (when (or out-delta? (info-need-out-write? info))
(when (or out-delta? (info-need-out-write? info)) (unless latex-dest (write-out info))
(unless latex-dest (write-out info)) (set-info-need-out-write?! info #f))
(set-info-need-out-write?! info #f)) (when in-delta? (set-info-need-in-write?! info #t))
(when in-delta? (set-info-need-in-write?! info #t)) (unless latex-dest
(unless latex-dest (let ([dir (doc-dest-dir doc)])
(let ([dir (doc-dest-dir doc)]) (unless (directory-exists? dir) (make-directory dir))
(unless (directory-exists? dir) (make-directory dir)) (for ([f (directory-list dir)]
(for ([f (directory-list dir)] #:when (regexp-match? #"[.]html$" (path-element->bytes f)))
#:when (regexp-match? #"[.]html$" (path-element->bytes f))) (delete-file (build-path dir f)))))
(delete-file (build-path dir f))))) (with-record-error
(with-record-error (doc-src-file doc)
(doc-src-file doc) (lambda () (send renderer render (list v) (list dest-dir) ri))
(lambda () void)
(send renderer render (list v) (list dest-dir) ri)) (set-info-time! info (/ (current-inexact-milliseconds) 1000))
void) (gc-point)
(set-info-time! info (/ (current-inexact-milliseconds) 1000)) (void)))))
(gc-point) (lambda () (set-info-failed?! info #t))))
(void)))))
(lambda ()
(set-info-failed?! info #t)))))
(define (gc-point) (define (gc-point)
;; Forcing a GC on document boundaries helps keep peak memory use down. ;; Forcing a GC on document boundaries helps keep peak memory use down.
@ -498,8 +463,8 @@
(define-namespace-anchor anchor) (define-namespace-anchor anchor)
(define (dynamic-require-doc path) (define (dynamic-require-doc path)
;; Use a separate namespace so that we don't end up with all the documentation ;; Use a separate namespace so that we don't end up with all the
;; loaded at once. ;; documentation loaded at once.
;; Use a custodian to compensate for examples executed during the build ;; Use a custodian to compensate for examples executed during the build
;; that may not be entirely clean (e.g., leaves a stuck thread). ;; that may not be entirely clean (e.g., leaves a stuck thread).
(let ([p (make-empty-namespace)] (let ([p (make-empty-namespace)]

View File

@ -756,6 +756,7 @@
(if no-specific-collections? #f (map cc-path ccs-to-compile)) (if no-specific-collections? #f (map cc-path ccs-to-compile))
#f #f
(not (null? (archives))) (not (null? (archives)))
(make-user)
(lambda (what go alt) (record-error what "Building docs" go alt))))) (lambda (what go alt) (record-error what "Building docs" go alt)))))
(define (render-pdf file) (define (render-pdf file)