www

commit 9caa39e94ceff7d05d19dafd9575b67d9a6f8e62
parent ec4fee69e3584df92700f6c69d7d527c8b95ef4d
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Fri,  5 Jul 2013 10:29:28 -0600

Support a CPUS=<n> argument for the `in-place' makefile target

Also, make `distro-build/drive-clients' use `#:j' configuration
for `PLT_SETUP_OPTIONS'.

original commit: ddbc8e5f4067e3a3f70f0a5bcb681134238a9b98

Diffstat:
M
pkgs/distro-build/config.rkt
 | 
4
++--
M
pkgs/distro-build/drive-clients.rkt
 | 
3
+++

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/distro-build/config.rkt b/pkgs/distro-build/config.rkt
@@ -151,8 +151,8 @@
 ;;   #:bits <integer> --- 32 or 64, affects Visual Studio path
 ;;   #:vc <string*> --- "x86" or "x64" to select the Visual C build mode;
 ;;                     default depends on bits
-;;   #:j <integer> --- parallelism for `make' on Unix and Mac OS X;
-;;                     defaults to 1
+;;   #:j <integer> --- parallelism for `make' on Unix and Mac OS X and
+;;                     for `raco setup' on all platforms; defaults to 1
 ;;   #:timeout <number> --- numbers of seconds to wait before declaring
 ;;                          failure; defaults to 30 minutes
 ;;   #:clean? <boolean> --- if true, then the build process on the client
diff --git a/pkgs/distro-build/drive-clients.rkt b/pkgs/distro-build/drive-clients.rkt
@@ -237,6 +237,7 @@
    (sh "cd " (q dir) " ; "
        "make -j " j " client"
        (client-args c server 'unix)
+       " PLT_SETUP_OPTIONS=\"-j " j "\""
        " CONFIGURE_ARGS_qq=" (qq (get-opt c '#:configure null) 'unix))))
 
 (define (windows-build c host port user server repo clean? pull?)
@@ -247,6 +248,7 @@
                  (if (= bits 32)
                      "x86"
                      "x64")))
+  (define j (or (get-opt c '#:j) 1))
   (define (cmd . args) 
     (list "cmd" "/c" (apply ~a args)))
   (ssh-script
@@ -261,6 +263,7 @@
         " && \"c:\\Program Files" (if (= bits 64) " (x86)" "") "\\Microsoft Visual Studio 9.0\\vc\\vcvarsall.bat\""
         " " vc
         " && nmake win32-client" 
+       " PLT_SETUP_OPTIONS=\"-j " j "\""
         (client-args c server 'windows))))
 
 (define (client-build c)