www

commit 2fb77f46e94058cec287d72c29082ccbfd7c71a5
parent ae4a03038ed820c2e2aea03c750a727a9f582805
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Wed, 17 Jul 2013 09:27:41 -0600

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.

original commit: 592a84d55c267f884a5e4e8479c097c2405e5bd0

Diffstat:
M
pkgs/distro-build/assemble-site.rkt
 | 
3
+++
M
pkgs/distro-build/drive-clients.rkt
 | 
3
++-
M
pkgs/distro-build/installer.rkt
 | 
7
++++++-
M
pkgs/distro-build/unpack-collects.rkt
 | 
5
++++-

4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pkgs/distro-build/assemble-site.rkt b/pkgs/distro-build/assemble-site.rkt
@@ -15,6 +15,7 @@
 (define pkgs-dir (build-path "pkgs"))
 (define catalog-dir (build-path "catalog"))
 (define doc-dir (build-path "doc"))
+(define log-dir (build-path "log"))
 
 (define-values (config-file config-mode)
   (command-line
@@ -92,6 +93,8 @@
      (write dht o)
      (newline o))))
 
+(copy log-dir)
+
 (copy installers-dir)
 
 (define doc-path (build-path docs-dir doc-dir))
diff --git a/pkgs/distro-build/drive-clients.rkt b/pkgs/distro-build/drive-clients.rkt
@@ -319,6 +319,7 @@
     (parameterize ([current-custodian cust])
       (thread (lambda ()
                 (sleep (* timeout-factor timeout))
+                (printf "timeout for ~s\n" (client-name c))
                 ;; try nice interrupt, first:
                 (set! timeout? #t)
                 (break-thread orig-thread)
@@ -336,7 +337,7 @@
 
 (define (client-thread c sequential? thunk)
   (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)))
     (make-directory* log-dir)
     (printf "Logging build: ~a\n" log-file)
diff --git a/pkgs/distro-build/installer.rkt b/pkgs/distro-build/installer.rkt
@@ -5,7 +5,8 @@
          "installer-exe.rkt"
          net/url
          racket/file
-         racket/path)
+         racket/path
+         "display-time.rkt")
 
 (define release? #f)
 (define upload-to #f)
@@ -32,6 +33,8 @@
                ""
                (string-append "-" dist-suffix)))))
 
+(display-time)
+
 (define installer-file
   (case (system-type)
     [(unix) (installer-sh human-name base-name dir-name release? dist-suffix)]
@@ -56,3 +59,5 @@
      (list (string-append "Description: " upload-desc))))
   (unless (equal? (read i) #t)
     (error "file upload failed")))
+
+(display-time)
diff --git a/pkgs/distro-build/unpack-collects.rkt b/pkgs/distro-build/unpack-collects.rkt
@@ -3,7 +3,8 @@
          racket/file
          racket/port
          net/url
-         file/untgz)
+         file/untgz
+         "display-time.rkt")
 
 (define dest-dir "bundle/racket")
 
@@ -19,6 +20,8 @@
      (string->url server)
      "collects.tgz"))))
 
+(display-time)
+
 (define lib-dir (build-path dest-dir "lib"))
 (make-directory* lib-dir)