From patchwork Wed Apr 26 00:57:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 49520 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E654127BBE2; Wed, 26 Apr 2023 01:58:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10751175BB for ; Wed, 26 Apr 2023 01:58:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prTTz-0006cz-Go; Tue, 25 Apr 2023 20:58:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prTTx-0006cI-Jt for guix-patches@gnu.org; Tue, 25 Apr 2023 20:58:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prTTv-00013p-OP for guix-patches@gnu.org; Tue, 25 Apr 2023 20:58:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prTTv-0001dP-KW for guix-patches@gnu.org; Tue, 25 Apr 2023 20:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63081] [PATCH 8/8] gnu: docbook-dsssl: Switch to copy-build-system. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 00:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63081@debbugs.gnu.org Cc: andreas@enge.fr, Bruno Victal , maxim.cournoyer@gmail.com Received: via spool by 63081-submit@debbugs.gnu.org id=B63081.16824706756225 (code B ref 63081); Wed, 26 Apr 2023 00:58:03 +0000 Received: (at 63081) by debbugs.gnu.org; 26 Apr 2023 00:57:55 +0000 Received: from localhost ([127.0.0.1]:53848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prTTm-0001cJ-St for submit@debbugs.gnu.org; Tue, 25 Apr 2023 20:57:55 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:46042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prTTc-0001bR-Fk for 63081@debbugs.gnu.org; Tue, 25 Apr 2023 20:57:45 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id A6985214A6; Wed, 26 Apr 2023 02:57:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5CD788009E; Wed, 26 Apr 2023 02:57:40 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id oyTTnH552k6k; Wed, 26 Apr 2023 02:57:40 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C531B8009D; Wed, 26 Apr 2023 02:57:39 +0200 (CEST) From: Bruno Victal Date: Wed, 26 Apr 2023 01:57:00 +0100 Message-Id: <10eb0782541de88bafd0dc1660ef43cc2220b7bf.1682470616.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-dsssl)[build-system]: Switch to copy-build-system. [arguments]: Add phase to install documentation as separate output. (docbook-dsssl-doc)[build-system]: Switch to copy-build-system. [arguments]: Adapt to new build-system. --- gnu/packages/docbook.scm | 54 ++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ced174b3b8..4a911bcec7 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -514,25 +514,22 @@ (define-public docbook-dsssl (sha256 (base32 "1g72y2yyc2k89kzs0lvrb9n7hjayw1hdskfpplpz97pf1c99wcig")))) - (build-system trivial-build-system) + (build-system copy-build-system) (outputs '("out" "doc")) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (dtd (string-append (assoc-ref %outputs "out") - "/sgml/dtd/docbook")) - (docbook-dsssl-doc (assoc-ref %build-inputs "docbook-dsssl-doc")) - (doc (assoc-ref %outputs "doc")) - (tar (assoc-ref %build-inputs "tar")) - (bzip2 (assoc-ref %build-inputs "bzip2"))) - (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin")) - (mkdir-p dtd) - (invoke "tar" "-xf" source "-C" dtd) - ;; The doc output contains 1.4 MiB of HTML documentation. - (symlink docbook-dsssl-doc doc))))) + (list + #:install-plan + #~`(("./" "sgml/dtd/docbook/" + #:exclude ("doc" "docsrc"))) + #:phases + #~(modify-phases %standard-phases + ;; The doc output contains 1.4 MiB of HTML documentation. + (add-after 'install 'install-doc + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p (string-append #$output:doc "/share/doc")) + (symlink (assoc-ref inputs "docbook-dsssl-doc") + (format #f "~a/share/doc/~a-~a" + #$output:doc #$name #$version))))))) (inputs (list docbook-dsssl-doc)) (native-inputs @@ -555,26 +552,11 @@ (define docbook-dsssl-doc (sha256 (base32 "1plp5ngc96pbna4rwglp9glcadnirbm3hlcjb4gjvq1f8biic9lz")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (docdir (string-append (assoc-ref %outputs "out") - "/share/doc/" "docbook-dsssl-" ,version)) - (tar (assoc-ref %build-inputs "tar")) - (bzip2 (assoc-ref %build-inputs "bzip2"))) - (setenv "PATH" (string-append tar "/bin" ":" bzip2 "/bin")) - (mkdir-p docdir) - ;; Extract the "doc" subdirectory. - (invoke "tar" "-xf" source "--strip-components=2" - "--no-same-owner" "-C" docdir - (string-append "docbook-dsssl-" ,version "/doc")))))) - (native-inputs - `(("bzip2" ,bzip2) - ("tar" ,tar))) + (list + #:install-plan + #~`(("doc/" #$(string-append "/share/doc/docbook-dsssl-" version))))) (home-page "https://docbook.org/") (synopsis "DocBook DSSSL style sheets documentation") (description "Documentation for the DocBook DSSSL style sheets.")