From 208f7cd155abdf07ae4f858aeeb26892eb08df88 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 Jun 2012 23:58:07 +0200 Subject: Abstract build systems. * Makefile.am (MODULES): Add `guix/build-system.scm' and `guix/build-system/gnu.scm'. Remove `guix/gnu-build-system.scm'. * guix/build-system.scm: New file. * guix/gnu-build-system.scm: Rename to... * guix/build-system/gnu.scm: ... this. (gnu-build-system): New variable. * tests/builders.scm: Adjust `use-module' clauses. ("gnu-build-system"): New test. --- Makefile.am | 3 +- guix/build-system.scm | 34 ++++++++++++++++++++++ guix/build-system/gnu.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++ guix/gnu-build-system.scm | 65 ----------------------------------------- tests/builders.scm | 7 ++++- 5 files changed, 115 insertions(+), 67 deletions(-) create mode 100644 guix/build-system.scm create mode 100644 guix/build-system/gnu.scm delete mode 100644 guix/gnu-build-system.scm diff --git a/Makefile.am b/Makefile.am index 814bd3b355..d41e55a188 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,8 @@ MODULES = \ guix/derivations.scm \ - guix/gnu-build-system.scm \ + guix/build-system.scm \ + guix/build-system/gnu.scm \ guix/http.scm \ guix/store.scm \ guix/utils.scm \ diff --git a/guix/build-system.scm b/guix/build-system.scm new file mode 100644 index 0000000000..179e7ef2df --- /dev/null +++ b/guix/build-system.scm @@ -0,0 +1,34 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Ludovic Courtès +;;; +;;; This file is part of Guix. +;;; +;;; 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. +;;; +;;; 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 Guix. If not, see . + +(define-module (guix build-system) + #:use-module (guix utils) + #:export (build-system + build-system? + build-system-name + build-system-description + build-system-builder + build-system-cross-builder)) + +(define-record-type* build-system make-build-system + build-system? + (name build-system-name) ; symbol + (description build-system-description) ; short description + (build build-system-builder) ; (store system name source inputs) + (cross-build build-system-cross-builder ; (store system x-system ...) + (default #f))) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm new file mode 100644 index 0000000000..e9eb02f251 --- /dev/null +++ b/guix/build-system/gnu.scm @@ -0,0 +1,73 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Ludovic Courtès +;;; +;;; This file is part of Guix. +;;; +;;; 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. +;;; +;;; 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 Guix. If not, see . + +(define-module (guix build-system gnu) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix build-system) + #:use-module (srfi srfi-1) + #:export (gnu-build + gnu-build-system)) + +;; Commentary: +;; +;; Standard build procedure for packages using the GNU Build System or +;; something compatible ("./configure && make && make install"). +;; +;; Code: + +(define %standard-inputs + (map (lambda (name) + (list name (nixpkgs-derivation name))) + '("gnutar" "gzip" "bzip2" "xz" "diffutils" "patch" + "coreutils" "gnused" "gnugrep" "bash" + "gcc" "binutils" "gnumake" "glibc"))) + +(define* (gnu-build store name source inputs + #:key (outputs '("out")) (configure-flags '()) + (make-flags '()) (phases '%standard-phases) + (system (%current-system))) + "Return a derivation called NAME that builds from tarball SOURCE, with +input derivation INPUTS, using the usual procedure of the GNU Build System." + (define builder + `(begin + (use-modules (guix build gnu-build-system)) + (gnu-build #:source ,(if (derivation-path? source) + (derivation-path->output-path source) + source) + #:outputs %outputs + #:inputs %build-inputs + #:phases ,phases + #:configure-flags ',configure-flags + #:make-flags ',make-flags))) + + (build-expression->derivation store name system + builder + `(("source" ,source) + ,@inputs + ,@%standard-inputs) + #:outputs outputs + #:modules '((guix build gnu-build-system) + (guix build utils)))) + +(define gnu-build-system + (build-system (name 'gnu) + (description + "The GNU Build System—i.e., ./configure && make && make install") + (build gnu-build))) ; TODO: add `gnu-cross-build' diff --git a/guix/gnu-build-system.scm b/guix/gnu-build-system.scm deleted file mode 100644 index 0311aaa76f..0000000000 --- a/guix/gnu-build-system.scm +++ /dev/null @@ -1,65 +0,0 @@ -;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès -;;; -;;; This file is part of Guix. -;;; -;;; 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. -;;; -;;; 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 Guix. If not, see . - -(define-module (guix gnu-build-system) - #:use-module (guix store) - #:use-module (guix utils) - #:use-module (guix derivations) - #:use-module (srfi srfi-1) - #:export (gnu-build)) - -;; Commentary: -;; -;; Standard build procedure for packages using the GNU Build System or -;; something compatible ("./configure && make && make install"). -;; -;; Code: - -(define %standard-inputs - (map (lambda (name) - (list name (nixpkgs-derivation name))) - '("gnutar" "gzip" "bzip2" "xz" "diffutils" "patch" - "coreutils" "gnused" "gnugrep" "bash" - "gcc" "binutils" "gnumake" "glibc"))) - -(define* (gnu-build store name source inputs - #:key (outputs '("out")) (configure-flags '()) - (make-flags '()) (phases '%standard-phases) - (system (%current-system))) - "Return a derivation called NAME that builds from tarball SOURCE, with -input derivation INPUTS, using the usual procedure of the GNU Build System." - (define builder - `(begin - (use-modules (guix build gnu-build-system)) - (gnu-build #:source ,(if (derivation-path? source) - (derivation-path->output-path source) - source) - #:outputs %outputs - #:inputs %build-inputs - #:phases ,phases - #:configure-flags ',configure-flags - #:make-flags ',make-flags))) - - (build-expression->derivation store name system - builder - `(("source" ,source) - ,@inputs - ,@%standard-inputs) - #:outputs outputs - #:modules '((guix build gnu-build-system) - (guix build utils)))) diff --git a/tests/builders.scm b/tests/builders.scm index 851baa9ebf..17bae2c754 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -19,7 +19,8 @@ (define-module (test-builders) #:use-module (guix http) - #:use-module (guix gnu-build-system) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix derivations) @@ -41,6 +42,10 @@ (and (build-derivations %store (list drv-path)) (file-exists? (derivation-path->output-path drv-path))))) +(test-assert "gnu-build-system" + (and (build-system? gnu-build-system) + (eq? gnu-build (build-system-builder gnu-build-system)))) + (test-assert "gnu-build" (let* ((url "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz") (hash (nix-base32-string->bytevector -- cgit v1.2.3