From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SCQsIZ7w+WRuqQAAauVa8A:P1 (envelope-from ) for ; Thu, 07 Sep 2023 17:47:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SCQsIZ7w+WRuqQAAauVa8A (envelope-from ) for ; Thu, 07 Sep 2023 17:47:42 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 75919341F0 for ; Thu, 7 Sep 2023 17:47:42 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694101662; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=3P77HRkDyTPKimqePqrXSMI97xaNx+fCBFy6xt0UJ2I=; b=o1IpYtnDljbI9vzkvOXadWJDuna6yOO6KDZgtFpU1k7lD4n2pNj1pkSJZV+oAnRwOsAV3g vHLl3Jqv2PHAFXw0dma/PiKpz3f7jEIr84tzVu0uk8YwMfNZZgLqqYt4lWO8VNXnGxZriJ fGtzvgaLm8qrCGBpr3dPVpfBSfIsiXFnNKUA5B40qBOfb4nN1DKwHWz/A6HxYEkJ3WrLWq y6G4xZ31wLVYmrDegjj/niNjJ1bbrm9zEBIFhTfMsfsTaNWw4qg4bZ+vf+QVBZLeygxojF Jjzlyw9kO/sidM5dYbLpYfFxVPwFK9cJ8e5Tg2leNNCJaYHbZ9n2qWRBTlQCOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694101662; a=rsa-sha256; cv=none; b=u+S+ikqKQpUjQIebZ80vPmNEc+oQujbCMAliTAqijBLVJOtTm71tSBHZDGUTv6oasArPuF V+gOfKW/pyslPCbgKFZdx/Rhx9QO/AspJKU2EFj2i2yymsnK5CV3xaFTa0gAImfxiffKrw pqlE8OfuAnXoSMG8ux7uGZGqgHYoX6zB8i6HDUFHumKR1GLaqbN4xW/ZkF6mGyTFtUcPSd qy3SEc8Yl3s9YPw+7m3WnCSgvoyoYuTXu9umPz9+jQI/IEFlPK47KE/4+8/EWwH1dKRltK jRwfD0Cm7Uu0sb71kc0/ep2feeYzZgpmPrh+Vi4UNwxjaCln9ISnUBVhQHSvmg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHE1-0007V9-4d; Thu, 07 Sep 2023 11:47:21 -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 1qeHDj-0007Ix-Bb for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -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 1qeHDi-0004CJ-NT for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDk-0005eU-E5 for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 8/8] 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 15:47: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.169410157221613 (code B ref 65807); Thu, 07 Sep 2023 15:47:04 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:12 +0000 Received: from localhost ([127.0.0.1]:41113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCt-0005cR-HZ for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:11 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCn-0005aT-JJ for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:06 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 29CB1E2E19 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NZuCv-xI_CLj for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +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 88EC7E2E18 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:50 -0400 Message-Id: <08486d261a51ddd5b64110e9ef2802fdf0b31f46.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -4.93 X-Spam-Score: -4.93 X-Migadu-Queue-Id: 75919341F0 X-TUID: XkFWBhQamgb9 * 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 ae3e6cf660..f4998cd84e 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 -- 2.40.1