From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:master commit in: eclass/ Date: Tue, 21 Apr 2020 10:20:58 +0000 (UTC) [thread overview] Message-ID: <1587464288.117147f43ceec694083a3c4749a6ecde64f76ade.andrewammerlaan@gentoo> (raw) commit: 117147f43ceec694083a3c4749a6ecde64f76ade Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Tue Apr 21 10:18:08 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Tue Apr 21 10:18:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=117147f4 eclass/docs: add doxygen support Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> eclass/docs.eclass | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/eclass/docs.eclass b/eclass/docs.eclass index c3fb6e3..b97f346 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.eclass @@ -89,6 +89,15 @@ esac # # Defaults to ${DOCDIR}/_build/html +# @ECLASS-VARIABLE: DOCS_CONFIG_NAME +# @DESCRIPTION: +# Name of the doc builder config file. +# +# Only relevant for doxygen, as it allows +# config files with non-standard names +# +# Defaults to Doxyfile for doxygen + if [[ ! ${_DOCS} ]]; then # For the python based DOCBUILDERS we need to inherit python-any-r1 @@ -108,6 +117,10 @@ case "${DOCBUILDER}" in inherit python-any-r1 fi ;; + "doxygen") + # do not need to inherit anything for doxygen + true + ;; "") die "DOCBUILDER unset, should be set to use ${ECLASS}" ;; @@ -243,6 +256,40 @@ mkdocs_compile() { rm "${OUTDIR}"/*.gz || die } +# @FUNCTION: doxygen_setup +# @DESCRIPTION: +# Sets dependencies for doxygen +doxygen_setup() { + debug-print-function ${FUNCNAME} + + DOCDEPEND="app-doc/doxygen + ${DOCDEPEND}" +} + +# @FUNCTION: mkdocs_compile +# @DESCRIPTION: +# Calls mkdocs to build docs. +# +# If you overwrite src_compile or python_compile_all +# do not call this function, call docs_compile instead +doxygen_compile() { + debug-print-function ${FUNCNAME} + use doc || return + + : ${DOCS_CONFIG_NAME:="Doxyfile"} + + local doxyfile=${DOCDIR}/${DOCS_CONFIG_NAME} + [[ -f ${doxyfile} ]] || + die "${doxyfile} not found, DOCDIR=${DOCDIR} or DOCS_CONFIG_NAME=${DOCS_CONFIG_NAME} wrong" + + # doxygen wants the HTML_OUTPUT dir to already exist + mkdir -p "${OUTDIR}" + + pushd "${DOCDIR}" + (cat "${doxyfile}" ; echo "HTML_OUTPUT=${OUTDIR}") | doxygen - || die + popd +} + # @FUNCTION: docs_compile # @DESCRIPTION: # Calls DOCBUILDER and sets HTML_DOCS @@ -270,6 +317,9 @@ docs_compile() { "mkdocs") mkdocs_compile ;; + "doxygen") + doxygen_compile + ;; esac HTML_DOCS+=( "${OUTDIR}/." ) @@ -294,6 +344,9 @@ case "${DOCBUILDER}" in python_append_deps mkdocs_setup ;; + "doxygen") + doxygen_setup + ;; esac if [[ ${EAPI} == [56] ]]; then @@ -305,7 +358,7 @@ fi # If this is a python package using distutils-r1 # then put the compile function in the specific # python function, else just put it in src_compile -if [[ ${_DISTUTILS_R1} ]]; then +if [[ ${_DISTUTILS_R1} && ( ${DOCBUILDER}="mkdocs" || ${DOCBUILDER}="sphinx" ) ]]; then python_compile_all() { docs_compile; } else src_compile() { docs_compile; }
WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ Date: Tue, 21 Apr 2020 10:20:37 +0000 (UTC) [thread overview] Message-ID: <1587464288.117147f43ceec694083a3c4749a6ecde64f76ade.andrewammerlaan@gentoo> (raw) Message-ID: <20200421102037.RglA1WmqNokacfPdW_tSlL5rt4LzirPVnKBY2rAPDbc@z> (raw) commit: 117147f43ceec694083a3c4749a6ecde64f76ade Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Tue Apr 21 10:18:08 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Tue Apr 21 10:18:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=117147f4 eclass/docs: add doxygen support Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> eclass/docs.eclass | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/eclass/docs.eclass b/eclass/docs.eclass index c3fb6e3..b97f346 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.eclass @@ -89,6 +89,15 @@ esac # # Defaults to ${DOCDIR}/_build/html +# @ECLASS-VARIABLE: DOCS_CONFIG_NAME +# @DESCRIPTION: +# Name of the doc builder config file. +# +# Only relevant for doxygen, as it allows +# config files with non-standard names +# +# Defaults to Doxyfile for doxygen + if [[ ! ${_DOCS} ]]; then # For the python based DOCBUILDERS we need to inherit python-any-r1 @@ -108,6 +117,10 @@ case "${DOCBUILDER}" in inherit python-any-r1 fi ;; + "doxygen") + # do not need to inherit anything for doxygen + true + ;; "") die "DOCBUILDER unset, should be set to use ${ECLASS}" ;; @@ -243,6 +256,40 @@ mkdocs_compile() { rm "${OUTDIR}"/*.gz || die } +# @FUNCTION: doxygen_setup +# @DESCRIPTION: +# Sets dependencies for doxygen +doxygen_setup() { + debug-print-function ${FUNCNAME} + + DOCDEPEND="app-doc/doxygen + ${DOCDEPEND}" +} + +# @FUNCTION: mkdocs_compile +# @DESCRIPTION: +# Calls mkdocs to build docs. +# +# If you overwrite src_compile or python_compile_all +# do not call this function, call docs_compile instead +doxygen_compile() { + debug-print-function ${FUNCNAME} + use doc || return + + : ${DOCS_CONFIG_NAME:="Doxyfile"} + + local doxyfile=${DOCDIR}/${DOCS_CONFIG_NAME} + [[ -f ${doxyfile} ]] || + die "${doxyfile} not found, DOCDIR=${DOCDIR} or DOCS_CONFIG_NAME=${DOCS_CONFIG_NAME} wrong" + + # doxygen wants the HTML_OUTPUT dir to already exist + mkdir -p "${OUTDIR}" + + pushd "${DOCDIR}" + (cat "${doxyfile}" ; echo "HTML_OUTPUT=${OUTDIR}") | doxygen - || die + popd +} + # @FUNCTION: docs_compile # @DESCRIPTION: # Calls DOCBUILDER and sets HTML_DOCS @@ -270,6 +317,9 @@ docs_compile() { "mkdocs") mkdocs_compile ;; + "doxygen") + doxygen_compile + ;; esac HTML_DOCS+=( "${OUTDIR}/." ) @@ -294,6 +344,9 @@ case "${DOCBUILDER}" in python_append_deps mkdocs_setup ;; + "doxygen") + doxygen_setup + ;; esac if [[ ${EAPI} == [56] ]]; then @@ -305,7 +358,7 @@ fi # If this is a python package using distutils-r1 # then put the compile function in the specific # python function, else just put it in src_compile -if [[ ${_DISTUTILS_R1} ]]; then +if [[ ${_DISTUTILS_R1} && ( ${DOCBUILDER}="mkdocs" || ${DOCBUILDER}="sphinx" ) ]]; then python_compile_all() { docs_compile; } else src_compile() { docs_compile; }
next reply other threads:[~2020-04-21 10:21 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-21 10:20 Andrew Ammerlaan [this message] 2020-04-21 10:20 ` [gentoo-commits] repo/proj/guru:dev commit in: eclass/ Andrew Ammerlaan -- strict thread matches above, loose matches on Subject: below -- 2024-11-27 14:34 [gentoo-commits] repo/proj/guru:master " David Roman 2024-10-19 0:05 David Roman 2024-07-14 17:47 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus 2024-07-14 17:47 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-14 15:27 Haelwenn Monnier 2024-07-01 13:50 David Roman 2024-04-27 11:10 David Roman 2024-04-01 11:32 Julien Roy 2024-03-31 17:57 Julien Roy 2024-03-31 17:49 [gentoo-commits] repo/proj/guru:dev " Julien Roy 2024-03-31 17:57 ` [gentoo-commits] repo/proj/guru:master " Julien Roy 2024-02-05 11:57 David Roman 2024-02-05 11:57 David Roman 2024-02-05 11:57 David Roman 2024-02-05 11:57 David Roman 2024-01-20 22:13 David Roman 2024-01-03 15:20 David Roman 2023-10-05 14:25 Viorel Munteanu 2023-10-05 6:18 Viorel Munteanu 2023-08-30 5:30 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu 2023-08-30 5:36 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu 2023-08-07 12:51 David Roman 2023-08-07 12:51 David Roman 2023-08-04 7:26 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus 2023-08-04 7:26 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus 2023-08-04 7:26 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus 2023-08-04 7:26 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus 2023-07-17 14:24 Florian Schmaus 2023-06-26 11:24 Andrew Ammerlaan 2023-05-22 5:17 Viorel Munteanu 2023-05-22 5:17 Viorel Munteanu 2023-05-11 14:32 Andrew Ammerlaan 2023-05-11 14:32 Andrew Ammerlaan 2023-05-11 14:32 Andrew Ammerlaan 2023-05-11 14:32 Andrew Ammerlaan 2023-05-11 14:32 Andrew Ammerlaan 2023-04-13 7:02 Florian Schmaus 2023-04-01 21:30 Haelwenn Monnier 2023-04-01 21:30 Haelwenn Monnier 2023-04-01 21:30 Haelwenn Monnier 2023-02-27 15:06 Florian Schmaus 2023-02-27 15:06 Florian Schmaus 2023-01-08 10:27 Florian Schmaus 2022-12-09 16:26 Ronny Gutbrod 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-26 10:54 Florian Schmaus 2022-11-16 19:33 Florian Schmaus 2022-11-16 19:33 Florian Schmaus 2022-11-16 19:33 Florian Schmaus 2022-11-05 15:26 Arthur Zamarin 2022-07-20 9:35 Andrew Ammerlaan 2022-07-20 9:35 Andrew Ammerlaan 2022-07-20 9:35 Andrew Ammerlaan 2022-07-20 9:35 Andrew Ammerlaan 2022-07-20 9:35 Andrew Ammerlaan 2022-07-11 6:54 Andrew Ammerlaan 2022-06-30 17:39 Florian Schmaus 2022-06-29 15:38 Florian Schmaus 2022-06-29 15:38 Florian Schmaus 2022-06-14 18:35 Haelwenn Monnier 2022-06-14 18:35 Haelwenn Monnier 2022-06-14 18:35 Haelwenn Monnier 2022-05-12 9:14 Andrew Ammerlaan 2022-05-05 14:42 Haelwenn Monnier 2022-05-05 14:42 Haelwenn Monnier 2022-05-05 14:42 Haelwenn Monnier 2022-04-15 20:58 Haelwenn Monnier 2022-04-15 20:58 Haelwenn Monnier 2022-04-14 13:31 Andrew Ammerlaan 2022-04-12 19:35 Ronny Gutbrod 2022-04-12 19:35 Ronny Gutbrod 2022-04-12 19:35 Ronny Gutbrod 2022-02-20 8:46 Florian Schmaus 2022-02-20 8:46 Florian Schmaus 2021-10-06 1:13 Theo Anderson 2021-09-30 19:39 Arthur Zamarin 2021-09-08 15:20 Arthur Zamarin 2021-07-26 14:05 Andrew Ammerlaan 2021-06-02 16:00 Andrew Ammerlaan 2021-05-24 22:25 Haelwenn Monnier 2021-05-17 19:11 Andrew Ammerlaan 2021-03-16 10:49 Andrew Ammerlaan 2021-03-15 10:58 Andrew Ammerlaan 2021-03-15 10:58 Andrew Ammerlaan 2020-12-06 10:46 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-12-06 10:49 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-05-07 11:13 Andrew Ammerlaan 2020-05-07 11:13 Andrew Ammerlaan 2020-05-01 15:39 Andrew Ammerlaan 2020-04-28 8:01 Andrew Ammerlaan 2020-04-28 7:44 Andrew Ammerlaan 2020-04-21 10:23 Andrew Ammerlaan 2020-04-07 7:42 Andrew Ammerlaan 2020-04-07 7:42 Andrew Ammerlaan 2020-04-07 7:27 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:42 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-07 7:16 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:42 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-06 18:26 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:42 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1587464288.117147f43ceec694083a3c4749a6ecde64f76ade.andrewammerlaan@gentoo \ --to=andrewammerlaan@riseup.net \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox