make installers: save client logs in "build/log" instead of "build/drive"

Also, copy log files to the destination of `make site', and report
the current time more frequently.
This commit is contained in:
Matthew Flatt 2013-07-17 09:27:41 -06:00
parent d50d0f8bca
commit 592a84d55c
6 changed files with 20 additions and 6 deletions

View File

@ -196,7 +196,8 @@ If "my-site-config.rkt" is a configuration module, then
drives the build farm, and the resulting installers are in drives the build farm, and the resulting installers are in
"build/installers", with a hash table mapping descriptions to "build/installers", with a hash table mapping descriptions to
installer filenames in "build/installer/table.rktd". installer filenames in "build/installer/table.rktd". A log file
for each client are written to "build/log".
The default CONFIG path is "build/site.rkt", so you could put your The default CONFIG path is "build/site.rkt", so you could put your
configuration file there and omit the `CONFIG' argument to configuration file there and omit the `CONFIG' argument to
@ -232,8 +233,8 @@ Generating Installer Web Sites
The `site' target of the makefile uses the `installers' target to The `site' target of the makefile uses the `installers' target to
generate a set of installers, and then it combines the installers, generate a set of installers, and then it combines the installers,
packages, and a package catalog into a directory that is suitable for packages, a package catalog, and log files into a directory that is
access via a web server. suitable for access via a web server.
Supply the same `CONFIG=...' and `CONFIG_MODE=...' arguments for Supply the same `CONFIG=...' and `CONFIG_MODE=...' arguments for
`site' as for `installers'. The configuration file should have a `site' as for `installers'. The configuration file should have a

View File

@ -15,6 +15,7 @@
(define pkgs-dir (build-path "pkgs")) (define pkgs-dir (build-path "pkgs"))
(define catalog-dir (build-path "catalog")) (define catalog-dir (build-path "catalog"))
(define doc-dir (build-path "doc")) (define doc-dir (build-path "doc"))
(define log-dir (build-path "log"))
(define-values (config-file config-mode) (define-values (config-file config-mode)
(command-line (command-line
@ -92,6 +93,8 @@
(write dht o) (write dht o)
(newline o)))) (newline o))))
(copy log-dir)
(copy installers-dir) (copy installers-dir)
(define doc-path (build-path docs-dir doc-dir)) (define doc-path (build-path docs-dir doc-dir))

View File

@ -319,6 +319,7 @@
(parameterize ([current-custodian cust]) (parameterize ([current-custodian cust])
(thread (lambda () (thread (lambda ()
(sleep (* timeout-factor timeout)) (sleep (* timeout-factor timeout))
(printf "timeout for ~s\n" (client-name c))
;; try nice interrupt, first: ;; try nice interrupt, first:
(set! timeout? #t) (set! timeout? #t)
(break-thread orig-thread) (break-thread orig-thread)
@ -336,7 +337,7 @@
(define (client-thread c sequential? thunk) (define (client-thread c sequential? thunk)
(unless stop? (unless stop?
(define log-dir (build-path "build" "drive")) (define log-dir (build-path "build" "log"))
(define log-file (build-path log-dir (client-name c))) (define log-file (build-path log-dir (client-name c)))
(make-directory* log-dir) (make-directory* log-dir)
(printf "Logging build: ~a\n" log-file) (printf "Logging build: ~a\n" log-file)

View File

@ -5,7 +5,8 @@
"installer-exe.rkt" "installer-exe.rkt"
net/url net/url
racket/file racket/file
racket/path) racket/path
"display-time.rkt")
(define release? #f) (define release? #f)
(define upload-to #f) (define upload-to #f)
@ -32,6 +33,8 @@
"" ""
(string-append "-" dist-suffix))))) (string-append "-" dist-suffix)))))
(display-time)
(define installer-file (define installer-file
(case (system-type) (case (system-type)
[(unix) (installer-sh human-name base-name dir-name release? dist-suffix)] [(unix) (installer-sh human-name base-name dir-name release? dist-suffix)]
@ -56,3 +59,5 @@
(list (string-append "Description: " upload-desc)))) (list (string-append "Description: " upload-desc))))
(unless (equal? (read i) #t) (unless (equal? (read i) #t)
(error "file upload failed"))) (error "file upload failed")))
(display-time)

View File

@ -3,7 +3,8 @@
racket/file racket/file
racket/port racket/port
net/url net/url
file/untgz) file/untgz
"display-time.rkt")
(define dest-dir "bundle/racket") (define dest-dir "bundle/racket")
@ -19,6 +20,8 @@
(string->url server) (string->url server)
"collects.tgz")))) "collects.tgz"))))
(display-time)
(define lib-dir (build-path dest-dir "lib")) (define lib-dir (build-path dest-dir "lib"))
(make-directory* lib-dir) (make-directory* lib-dir)

View File

@ -19,6 +19,7 @@
initialize-primitive-object initialize-primitive-object
'tree% 'tree%
object% object%
null
'(leaves) '(leaves)
null null
method-names method-names