suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Parallel-Build] remove -u, -j 1 is uniprocessor, SETUP_OPTIONTS => PLT_SETUP_OPTIONS

Browse Source
This commit is contained in:
Kevin Tew 2010-07-06 10:01:29 -06:00
parent a6723283b8
commit c9e84f9f67
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
collects/setup/option-sig.rkt
View File

@ -21,7 +21,6 @@
call-install call-install
call-post-install call-post-install
pause-on-errors pause-on-errors
parallel-build
parallel-workers parallel-workers
force-unpacks force-unpacks
doc-pdf-dest doc-pdf-dest

3
collects/setup/option-unit.rkt
View File

@ -27,8 +27,7 @@
(define setup-program-name (make-parameter "setup-plt")) (define setup-program-name (make-parameter "setup-plt"))
(define-flag-param parallel-build #t) (define-flag-param parallel-workers (min (processor-count) 8))
(define-flag-param parallel-workers (processor-count))
(define-flag-param verbose #f) (define-flag-param verbose #f)
(define-flag-param make-verbose #f) (define-flag-param make-verbose #f)
(define-flag-param compiler-verbose #f) (define-flag-param compiler-verbose #f)

3
collects/setup/setup-cmdline.rkt
View File

@ -39,10 +39,7 @@
(call-install #f) (call-install #f)
(make-launchers #f) (make-launchers #f)
(make-info-domain #f) (make-info-domain #f)
(parallel-build #f)
(make-docs #f)))] (make-docs #f)))]
[("-u" "--no-parallel-build") "Do not use parallel build"
(add-flags '((parallel-build #f)))]
[("-j" "--workers") workers "Use <#> parallel-workers" [("-j" "--workers") workers "Use <#> parallel-workers"
(add-flags `((parallel-workers ,(string->number workers))))] (add-flags `((parallel-workers ,(string->number workers))))]
[("-n" "--no-zo") "Do not produce .zo files" [("-n" "--no-zo") "Do not produce .zo files"

6
collects/setup/setup-unit.rkt
View File

@ -658,8 +658,8 @@
(define (move-drscheme-to-end cct) (define (move-drscheme-to-end cct)
(call-with-values (lambda () (partition (lambda (x) (not (string=? (cc-name (car x)) "drscheme"))) cct)) append)) (call-with-values (lambda () (partition (lambda (x) (not (string=? (cc-name (car x)) "drscheme"))) cct)) append))
(setup-printf #f "--- compiling collections ---") (setup-printf #f "--- compiling collections ---")
(match (parallel-build) (match (parallel-workers)
[#t [(? (lambda (x) (x . > . 1)))
(compile-cc (collection->cc (list (string->path "racket"))) 0) (compile-cc (collection->cc (list (string->path "racket"))) 0)
(managed-compile-zo (build-path main-collects-dir "setup/parallel-build-worker.rkt")) (managed-compile-zo (build-path main-collects-dir "setup/parallel-build-worker.rkt"))
(with-specified-mode (with-specified-mode
@ -671,7 +671,7 @@
(parallel-compile (parallel-workers) setup-fprintf cct)) (parallel-compile (parallel-workers) setup-fprintf cct))
(for/fold ([gcs 0]) ([cc planet-dirs-to-compile]) (for/fold ([gcs 0]) ([cc planet-dirs-to-compile])
(compile-cc cc gcs)))] (compile-cc cc gcs)))]
[#f [else
(with-specified-mode (with-specified-mode
(for/fold ([gcs 0]) ([cc ccs-to-compile]) (for/fold ([gcs 0]) ([cc ccs-to-compile])
(compile-cc cc gcs)))])) (compile-cc cc gcs)))]))

2
src/Makefile.in
View File

@ -54,7 +54,7 @@ both:
# Install (common) ---------------------------------------- # Install (common) ----------------------------------------
SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "raco setup" -l- setup $(SETUP_OPTIONS) @INSTALL_SETUP_FLAGS@ SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "raco setup" -l- setup $(PLT_SETUP_OPTIONS) $(PLT_ISO) @INSTALL_SETUP_FLAGS@
install: install:
$(MAKE) install-@MAIN_VARIANT@ $(MAKE) install-@MAIN_VARIANT@