From patchwork Thu Sep 7 16:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53639 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 4E9BC27BBEA; Thu, 7 Sep 2023 17:39:21 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 8BAFC27BBEB for ; Thu, 7 Sep 2023 17:39:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeI23-0007PS-IV; Thu, 07 Sep 2023 12:39:03 -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 1qeI22-0007P7-Qx for guix-patches@gnu.org; Thu, 07 Sep 2023 12:39:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeI22-0000Ga-IF for guix-patches@gnu.org; Thu, 07 Sep 2023 12:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeI24-0003w6-8M for guix-patches@gnu.org; Thu, 07 Sep 2023 12:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH v2 9/9] gnu: libftdi: Build API documentation. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410469815009 (code B ref 65807); Thu, 07 Sep 2023 16:39:04 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 16:38:18 +0000 Received: from localhost ([127.0.0.1]:41227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeI1K-0003ty-1S for submit@debbugs.gnu.org; Thu, 07 Sep 2023 12:38:18 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:48662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeI1F-0003sV-FI for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 12:38:14 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 02B7863130 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 16:38:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yb5VOcd-EFiq for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 16:38:02 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id B0E5A6312D for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 16:38:02 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 12:37:58 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 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/libftdi.scm (libftdi)[outputs]: Add "doc" output. [arguments]<#:configure-flags>: Add "-DDOCUMENTATION". <#:phases>: Add "install-documentation" phase. [native-inputs]: Add doxygen, graphviz. --- gnu/packages/libftdi.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index bdfc635379..02efcbbbc0 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -28,6 +28,8 @@ (define-module (gnu packages libftdi) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages graphviz) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -49,12 +51,13 @@ (define-public libftdi (patches (search-patches "libftdi-fix-paths-when-FTDIPP-set.patch")))) (build-system cmake-build-system) - (outputs '("out" "python")) + (outputs '("out" "doc" "python")) (arguments (list #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) + "-DDOCUMENTATION=ON" "-DEXAMPLES=OFF" "-DFTDIPP=ON" "-DLIB_SUFFIX=''" ; place libraries in /lib, not /lib64 @@ -74,11 +77,20 @@ (define-public libftdi (rename-file (string-append #$output "/share/libftdi/examples") (string-append #$output:python - "/share/libftdi/examples")))))) + "/share/libftdi/examples"))))) + (add-after 'install-python-binding 'install-documentation + (lambda _ + (let ((share (string-append #$output:doc "/share"))) + (copy-recursively "doc/man" + (string-append share "/man")) + (copy-recursively "doc/html" + (string-append share "/doc/" + #$name "-" #$version + "/html")))))) #:test-target "check" #:tests? #f)) ; tests fail without access to USB (native-inputs - (list pkg-config python swig)) + (list doxygen graphviz pkg-config python swig)) (inputs (list boost libconfuse)) (propagated-inputs