nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Julien Lepiller 2018-11-17 17:51:52 +01:00
parent 1472d19abf
commit 5a0affba3f
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
guix/build/ocaml-build-system.scm
View File

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