From ecdd1ebc7a6f5cbc22be2713bcfdc27ee40ec53e Mon Sep 17 00:00:00 2001 From: Kevin Tew Date: Mon, 5 Jul 2010 14:19:59 -0600 Subject: [PATCH] Parallel build fixes --- collects/meta/props | 1 + collects/setup/parallel-build-worker.rkt | 6 ++++-- collects/setup/setup-unit.rkt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/collects/meta/props b/collects/meta/props index 21e3d172e6..c2a72186d1 100755 --- a/collects/meta/props +++ b/collects/meta/props @@ -1232,6 +1232,7 @@ path/s is either such a string or a list of them. "collects/scriblib" responsible (mflatt) "collects/setup" responsible (mflatt) "collects/setup/main.rkt" drdr:command-line #f +"collects/setup/parallel-build-worker.rkt" drdr:command-line #f "collects/setup/plt-installer.rkt" drdr:command-line (gracket-text "-t" *) "collects/setup/setup-go.rkt" drdr:command-line #f "collects/setup/unixstyle-install.rkt" drdr:command-line (mzc *) diff --git a/collects/setup/parallel-build-worker.rkt b/collects/setup/parallel-build-worker.rkt index 93328222e2..365714d63d 100644 --- a/collects/setup/parallel-build-worker.rkt +++ b/collects/setup/parallel-build-worker.rkt @@ -1,5 +1,7 @@ -#lang racket +#lang racket/base (require compiler/cm) +(require racket/match) + (let ([cmc (make-caching-managed-compile-zo)] [worker-id (read)]) (let loop () @@ -25,7 +27,7 @@ [current-output-port out-str-port] [current-error-port err-str-port] ;[manager-compile-notify-handler pp] -) + ) (cmc (build-path dir file))) (send/resp 'DONE)))) diff --git a/collects/setup/setup-unit.rkt b/collects/setup/setup-unit.rkt index 18082a0812..3336ee1f32 100644 --- a/collects/setup/setup-unit.rkt +++ b/collects/setup/setup-unit.rkt @@ -661,6 +661,7 @@ (match (parallel-build) [#t (compile-cc (collection->cc (list (string->path "racket"))) 0) + (managed-compile-zo (build-path main-collects-dir "setup/parallel-build-worker.rkt")) (with-specified-mode (let ([cct (move-drscheme-to-end (sort-collections-tree (collection-tree-map top-level-plt-collects)))]) (iterate-cct (lambda (cc)