[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/30: build-system/scons: Use invoke instead of system*.
From: |
Mark H. Weaver |
Subject: |
09/30: build-system/scons: Use invoke instead of system*. |
Date: |
Fri, 16 Mar 2018 05:03:36 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 2eeffc0accf59f0173e5c3a32cf19812d912da73
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 03:31:15 2018 -0400
build-system/scons: Use invoke instead of system*.
* guix/build/scons-build-system.scm (build, check, install): Use invoke.
---
guix/build/scons-build-system.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/guix/build/scons-build-system.scm
b/guix/build/scons-build-system.scm
index 96c6539..eb013f0 100644
--- a/guix/build/scons-build-system.scm
+++ b/guix/build/scons-build-system.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Arun Isaac <address@hidden>
+;;; Copyright © 2018 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,24 +32,23 @@
(define* (build #:key outputs (scons-flags '()) (parallel-build? #t)
#:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p out)
- (zero? (apply system* "scons"
- (append (if parallel-build?
- (list "-j" (number->string
- (parallel-job-count)))
- (list))
- scons-flags)))))
+ (apply invoke "scons"
+ (append (if parallel-build?
+ (list "-j" (number->string
+ (parallel-job-count)))
+ (list))
+ scons-flags))))
(define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys)
"Run the test suite of a given SCons application."
- (cond (tests?
- (zero? (apply system* "scons" test-target scons-flags)))
- (else
- (format #t "test suite not run~%")
- #t)))
+ (if tests?
+ (apply invoke "scons" test-target scons-flags)
+ (format #t "test suite not run~%"))
+ #t)
(define* (install #:key outputs (scons-flags '()) #:allow-other-keys)
"Install a given SCons application."
- (zero? (apply system* "scons" "install" scons-flags)))
+ (apply invoke "scons" "install" scons-flags))
(define %standard-phases
(modify-phases gnu:%standard-phases
- 12/30: gnu: linux-libre-headers: Use invoke instead of system*., (continued)
- 12/30: gnu: linux-libre-headers: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 10/30: bootstrap: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 19/30: gnu: unzip: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 18/30: gnu: zlib: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 21/30: gnu: bzip2: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 06/30: build-system/perl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 14/30: gnu: glibc-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 03/30: build-system/gnu: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 17/30: gnu: tcsh: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 23/30: gnu: eudev: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 09/30: build-system/scons: Use invoke instead of system*.,
Mark H. Weaver <=
- 30/30: gnu: attr: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 02/30: gnu-dist: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 26/30: cvs-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 22/30: gnu: openssl: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 20/30: gnu: zip: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 11/30: download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 15/30: gnu: glibc/hurd: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 29/30: build: emacs-utils: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 27/30: svn-download: Use invoke instead of system*., Mark H. Weaver, 2018/03/16
- 13/30: gnu: glibc-utf8-locales: Use invoke instead of system*., Mark H. Weaver, 2018/03/16