From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 9F4B84CAB for ; Fri, 31 Aug 2018 20:21:06 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id o18-v6so6197977wmc.0 for ; Fri, 31 Aug 2018 11:21:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+U32wZS7RKYC3tzk2fGI80enT3ZioJNDdjrEivbn8+k=; b=l94ZBfCLanyLXZnjo8vK3uhIX32aojyV4UAQKpvpsemjjbbyIaNhTnz5vESzPIkRl5 Mye06g6cFG3JPRbIlgQ+Y/BJ9brWtDx5Pfdp1w5jKm6zYoNCYBJ7pw9iMEuYiRGW9G1v UyVgMU/qwTIjJVrwG/am6tmj/3KOYjCuAiFCgloNLnNsCq3ABBv2BsV63dfOlBsAG0yY 0jrgZVHCvBGKgGDB6U+s8401Ppo+/l4Fz7ti5HDiIytIxI+l6ex6vyIKYVVMhd5qOMxy pe8EF2abhVHu+OV0ZWSjAPmDW+X67zOgvVMbzbS8OTnF5KSxJvL4zYdfKepMblsqqNkq hDAw== X-Gm-Message-State: APzg51DyToinZRFkgxv+5wLU6C+QZPriLRTPFaghpeILClfuiqlcdaGB /yKzOLBpmGe36VI5YQrD6Na+sw+I X-Google-Smtp-Source: ANB0VdYuP6D3cd70u72OZuwE6iHkcldWJgzLgiy+DRun3k52m62mLW+h3YKGIgq+Jv6Esy6QNUnTzw== X-Received: by 2002:a1c:ac1:: with SMTP id 184-v6mr5310654wmk.119.1535739666019; Fri, 31 Aug 2018 11:21:06 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 200-v6sm9343422wmv.6.2018.08.31.11.21.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 11:21:04 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, john.mcnamara@intel.com, marko.kovacevic@intel.com, thomas@monjalon.net Date: Fri, 31 Aug 2018 19:20:51 +0100 Message-Id: <20180831182055.30772-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-dev] [PATCH 0/4] Meson: build Doxygen documentation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2018 18:21:06 -0000 I have tested this by using diffoscope between the docs built by the makefiles and by this Meson patchset, and verified they are all identical. There are both a new "doc" target (ninja doc) and a configuration option. This is due to the following bug in Meson: https://github.com/mesonbuild/meson/issues/4107 because of it it's not possible to have simply an optional target, as its files will not be installed. So by default the documentation is off, if one wants to just build it 'ninja doc' can be used, but if one wants to both build and install the config option 'enable_docs' has to be enabled. A couple of small refactoring was done to the makefile doc build, to make things easier and doable by both build systems. Luca Boccassi (4): mk: use script to generate examples.dox mk: use templated doxygen config, modified on the fly build: use same version as make showversion in Meson build: generate API documentation with Meson doc/api/doxy-api.conf | 87 -------------------------------- doc/api/doxy-api.conf.in | 96 ++++++++++++++++++++++++++++++++++++ doc/api/generate_doxygen.sh | 10 ++++ doc/api/generate_examples.sh | 14 ++++++ doc/api/meson.build | 51 +++++++++++++++++++ doc/build-sdk-meson.txt | 2 + doc/meson.build | 4 ++ meson.build | 5 +- meson_options.txt | 2 + mk/rte.sdkdoc.mk | 21 +++----- 10 files changed, 191 insertions(+), 101 deletions(-) delete mode 100644 doc/api/doxy-api.conf create mode 100644 doc/api/doxy-api.conf.in create mode 100755 doc/api/generate_doxygen.sh create mode 100755 doc/api/generate_examples.sh create mode 100644 doc/api/meson.build create mode 100644 doc/meson.build -- 2.18.0