add `CORE_CONFIGURE_ARGS' to top-level makefile
Also, `#:configure' to build-farm configuration. original commit: dedd2f671a92c2173f7e1a022558bedf5969c94b
This commit is contained in:
parent
9fc547f656
commit
4c47b057fd
|
@ -80,6 +80,7 @@
|
||||||
;; #:vbox <string> --- Virtual Box machine name; if provided the
|
;; #:vbox <string> --- Virtual Box machine name; if provided the
|
||||||
;; virtual machine is started and stopped as needed
|
;; virtual machine is started and stopped as needed
|
||||||
;; #:platform <symbol> --- 'windows or 'unix, defaults to 'unix
|
;; #:platform <symbol> --- 'windows or 'unix, defaults to 'unix
|
||||||
|
;; #:configure (<string> ...) --- arguments to `configure'
|
||||||
;; #:bits <integer> --- 32 or 64, affects Visual Studio path
|
;; #:bits <integer> --- 32 or 64, affects Visual Studio path
|
||||||
;; #:vc <string*> --- "x86" or "x64" to select the Visual C build mode;
|
;; #:vc <string*> --- "x86" or "x64" to select the Visual C build mode;
|
||||||
;; default depends on bits
|
;; default depends on bits
|
||||||
|
@ -142,6 +143,7 @@
|
||||||
[(#:dir) (string? val)]
|
[(#:dir) (string? val)]
|
||||||
[(#:vbox) (string? val)]
|
[(#:vbox) (string? val)]
|
||||||
[(#:platform) (memq val '(unix windows))]
|
[(#:platform) (memq val '(unix windows))]
|
||||||
|
[(#:configure) (and (list? val) (andmap string? val))]
|
||||||
[(#:bits) (or (equal? val 32) (equal? val 64))]
|
[(#:bits) (or (equal? val 32) (equal? val 64))]
|
||||||
[(#:vc) (or (equal? val "x86") (equal? val "x64"))]
|
[(#:vc) (or (equal? val "x86") (equal? val "x64"))]
|
||||||
[(#:timeout) (real? val)]
|
[(#:timeout) (real? val)]
|
||||||
|
@ -376,7 +378,9 @@
|
||||||
"git pull")
|
"git pull")
|
||||||
(sh "cd " (q dir) " ; "
|
(sh "cd " (q dir) " ; "
|
||||||
"make -j " j " client"
|
"make -j " j " client"
|
||||||
(client-args server pkgs dist-name dist-dir))))
|
(client-args server pkgs dist-name dist-dir)
|
||||||
|
" CORE_CONFIGURE_ARGS=" (q (apply ~a #:separator " "
|
||||||
|
(get-opt c '#:configure null))))))
|
||||||
|
|
||||||
(define (windows-build c host port user server repo clean?
|
(define (windows-build c host port user server repo clean?
|
||||||
pkgs dist-name dist-dir)
|
pkgs dist-name dist-dir)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user