From abd4ca272b784545c71d4ec12554670cdd2cd8ee Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sat, 15 May 2021 00:41:34 -0400 Subject: [PATCH 6/7] build-system: Add janet-build-system. * guix/build-system/janet.scm: New file. * guix/build/janet-build-system.scm: New file. * Makefile.am (MODULES): Add them. --- Makefile.am | 2 + guix/build-system/janet.scm | 116 ++++++++++++++++++++++++++++++ guix/build/janet-build-system.scm | 62 ++++++++++++++++ 3 files changed, 180 insertions(+) create mode 100644 guix/build-system/janet.scm create mode 100644 guix/build/janet-build-system.scm diff --git a/Makefile.am b/Makefile.am index 4cbef5a6e6..1a88604966 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,6 +139,7 @@ MODULES = \ guix/build-system/emacs.scm \ guix/build-system/font.scm \ guix/build-system/go.scm \ + guix/build-system/janet.scm \ guix/build-system/meson.scm \ guix/build-system/minify.scm \ guix/build-system/asdf.scm \ @@ -191,6 +192,7 @@ MODULES = \ guix/build/minify-build-system.scm \ guix/build/font-build-system.scm \ guix/build/go-build-system.scm \ + guix/build/janet-build-system.scm \ guix/build/android-repo.scm \ guix/build/asdf-build-system.scm \ guix/build/bzr.scm \ diff --git a/guix/build-system/janet.scm b/guix/build-system/janet.scm new file mode 100644 index 0000000000..de0947d86f --- /dev/null +++ b/guix/build-system/janet.scm @@ -0,0 +1,116 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Jack Hill +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system janet) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix derivations) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (ice-9 match) + #:export (janet-build + janet-build-system)) + +(define %janet-build-system-modules + ;; Build-side modules imported by default. + `((guix build janet-build-system) + ,@%gnu-build-system-modules)) + +(define (default-janet) + "Return the default Janet package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((lisp (resolve-interface '(gnu packages lisp)))) + (module-ref lisp 'janet))) + +(define* (lower name + #:key source inputs native-inputs outputs + system target + (janet (default-janet)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:source #:target #:janet #:inputs #:native-inputs)) + + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("janet" ,janet) + ,@native-inputs)) + (outputs outputs) + (build janet-build) + (arguments (strip-keyword-arguments private-keywords arguments)))) + +(define* (janet-build store name inputs + #:key + (search-paths '()) + (tests? #t) + (phases '(@ (guix build janet-build-system) + %standard-phases)) + (outputs '("out")) + (system (%current-system)) + (locale "en_US.utf8") + (guile #f) + (imported-modules %janet-build-system-modules) + (modules '((guix build janet-build-system) + (guix build utils) + (guix utils)))) + "Build SOURCE using RUBY and INPUTS." + (define builder + `(begin + (use-modules ,@modules) + (janet-build #:name ,name + #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:tests? ,tests? + #:phases ,phases + #:outputs %outputs + #:inputs %build-inputs))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:inputs inputs + #:system system + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define janet-build-system + (build-system + (name 'janet) + (description "The standard Janet build system") + (lower lower))) diff --git a/guix/build/janet-build-system.scm b/guix/build/janet-build-system.scm new file mode 100644 index 0000000000..da4a6f3698 --- /dev/null +++ b/guix/build/janet-build-system.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Jack Hill +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build janet-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (guix utils) + #:export (%standard-phases + janet-build)) + +;; Commentary: +;; +;; Builder-side code of the standard Janet package build procedure. +;; +;; Code: + +(define* (build #:rest arguments) + "Build a Janet package with jpm" + (invoke "jpm" "--verbose" + (string-append "--compiler=" (cc-for-target)) + (string-append "--cpp-compiler=" (cxx-for-target)) + "build")) + +(define* (check #:key tests? #:allow-other-keys) + "Test a janet package with jpm. Skip the tests if TESTS? is #f." + (if tests? + (invoke "jpm" "--verbose" "test"))) + +(define* (install #:key outputs #:allow-other-keys) + "Install a Janet package with jpm" + (let ((out (assoc-ref outputs "out"))) + (invoke "jpm" "--verbose" + (string-append "--modpath=" out "/lib/janet") + (string-append "--binpath=" out "/bin") + "install"))) + +(define %standard-phases + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (delete 'configure) + (replace 'build build) + (replace 'check check) + (replace 'install install))) + +(define* (janet-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + (apply gnu:gnu-build #:inputs inputs #:phases phases args)) -- 2.31.1