[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: build-system/ocaml: Use invoke and return #t.

From: julien lepiller
Subject: 01/02: build-system/ocaml: Use invoke and return #t.
Date: Sun, 18 Nov 2018 12:52:36 -0500 (EST)

roptat pushed a commit to branch master
in repository guix.

commit 5a0affba3f677810e878c0b336b11bdc71b17870
Author: Julien Lepiller <address@hidden>
Date:   Sat Nov 17 17:51:52 2018 +0100

    build-system/ocaml: Use invoke and return #t.
    * guix/build/ocaml-build-system.scm (configure, build, check, install)
    (prepare-install): Use invoke and return #t.
 guix/build/ocaml-build-system.scm | 45 ++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/guix/build/ocaml-build-system.scm 
index d10431d..99111ad 100644
--- a/guix/build/ocaml-build-system.scm
+++ b/guix/build/ocaml-build-system.scm
@@ -49,37 +49,40 @@
         (format #t "running '' with arguments ~s~%" args)
-        (zero? (apply system* "ocaml" "" args)))
+        (apply invoke "ocaml" "" args))
        (let ((args `("-prefix" ,out ,@configure-flags)))
         (format #t "running 'configure' with arguments ~s~%" args)
-        (zero? (apply system* "./configure" args))))))
+        (apply invoke "./configure" args))))
+    #t)
 (define* (build #:key inputs outputs (build-flags '()) (make-flags '())
                 (use-make? #f) #:allow-other-keys)
   "Build the given package."
   (if (and (file-exists? "") (not use-make?))
-    (zero? (apply system* "ocaml" "" "-build" build-flags))
+    (apply invoke "ocaml" "" "-build" build-flags)
     (if (file-exists? "Makefile")
-      (zero? (apply system* "make" make-flags))
+      (apply invoke "make" make-flags)
       (let ((file (if (file-exists? "pkg/") "pkg/" 
-        (zero? (apply system* "ocaml" "-I"
-                              (string-append (assoc-ref inputs "findlib")
-                                             "/lib/ocaml/site-lib")
-                              file build-flags))))))
+        (apply invoke "ocaml" "-I"
+                      (string-append (assoc-ref inputs "findlib")
+                                     "/lib/ocaml/site-lib")
+                      file build-flags))))
+  #t)
 (define* (check #:key inputs outputs (make-flags '()) (test-target "test") 
                   (use-make? #f) #:allow-other-keys)
   "Install the given package."
   (when tests?
     (if (and (file-exists? "") (not use-make?))
-      (zero? (system* "ocaml" "" (string-append "-" test-target)))
+      (invoke "ocaml" "" (string-append "-" test-target))
       (if (file-exists? "Makefile")
-        (zero? (apply system* "make" test-target make-flags))
+        (apply invoke "make" test-target make-flags)
         (let ((file (if (file-exists? "pkg/") "pkg/" 
-          (zero? (system* "ocaml" "-I"
-                          (string-append (assoc-ref inputs "findlib")
-                                         "/lib/ocaml/site-lib")
-                          file test-target)))))))
+          (invoke "ocaml" "-I"
+                  (string-append (assoc-ref inputs "findlib")
+                                 "/lib/ocaml/site-lib")
+                  file test-target)))))
+  #t)
 (define* (install #:key outputs (build-flags '()) (make-flags '()) (use-make? 
                   (install-target "install")
@@ -87,17 +90,19 @@
   "Install the given package."
   (let ((out (assoc-ref outputs "out")))
     (if (and (file-exists? "") (not use-make?))
-      (zero? (apply system* "ocaml" ""
-                    (string-append "-" install-target) build-flags))
+      (apply invoke "ocaml" ""
+             (string-append "-" install-target) build-flags)
       (if (file-exists? "Makefile")
-        (zero? (apply system* "make" install-target make-flags))
-        (zero? (system* "opam-installer" "-i" (string-append "--prefix=" out)
-                        (string-append "--libdir=" out 
+        (apply invoke "make" install-target make-flags)
+        (invoke "opam-installer" "-i" (string-append "--prefix=" out)
+                (string-append "--libdir=" out "/lib/ocaml/site-lib")))))
+  #t)
 (define* (prepare-install #:key outputs #:allow-other-keys)
   "Prepare for building the given package."
   (mkdir-p (string-append (assoc-ref outputs "out") "/lib/ocaml/site-lib"))
-  (mkdir-p (string-append (assoc-ref outputs "out") "/bin")))
+  (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))
+  #t)
 (define %standard-phases
   ;; Everything is as with the GNU Build System except for the `configure'

reply via email to

[Prev in Thread] Current Thread [Next in Thread]