From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2E7915803E for ; Sun, 31 Dec 2023 16:27:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 036182BC076; Sun, 31 Dec 2023 16:26:46 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 422962BC03C for ; Sun, 31 Dec 2023 16:26:45 +0000 (UTC) Received: from CYRTRY1.fritz.box ([109.250.31.104]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.146]) with ESMTPSA (Nemesis) id 1MNtjq-1rZR6Z3jeC-00OGew for ; Sun, 31 Dec 2023 17:26:43 +0100 From: "Volkmar W. Pogatzki" To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 3/3] java-utils-2.eclass: enhance ejavadoc Date: Sun, 31 Dec 2023 17:26:02 +0100 Message-ID: <20231231162632.10228-3-gentoo@pogatzki.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231231162632.10228-1-gentoo@pogatzki.net> References: <20231231162632.10228-1-gentoo@pogatzki.net> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:Ezb2Ad/MVJ4bYVFcRzF6WrF1n0fpDSPzSg8M9BmIxFEbsZuIv9o FcjgGzS6Zk9tzJfQqxHTVguXEEAeNI7XR6nghpmCr+i6cBqoUsYc78Cu13N0HiReGgyl6X3 uWaU8Z8k3KRjmLuHBNyvLV7RR+vHUHWQu4mlpN/cK9OqCgRyQ4q9NZNRKwQFUEQtQuug7BC p4yilam217UxXCH+9GyLQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:gT6xxbBVFp4=;Dkk1E59oqTTgvHXWWsMO3LmGXb6 g8ungvFihSgWjQ6gLJg+dtTzYNvHZtd9iVpDX88Cb0OrUc56Pzs6F4o6ZYaCzhd/kvhUrc0Wu 9QyxTSAlr0+3RFUUBQJzAkPCYr9rCJb5Ebp1lS9GxufeXPjJLr650Qlt2OlUCvrAvEkddDOTj RGP+BS4q2JifJ4OyPAYttVehPC9N+k0Tv7SihzfO6qHyFSNu45Jy1Fj2Z2OrH7ux/OxA0wjNv x0Q/1vAbiFlzBPC9pxBAs2xUhC1pyhUnXK5y+WeWi4g1KQ7XnE2TgKyLqWMS+7KvLDZtvIx9Z y/qoEnbVWla8Wfgm0vmVCjePeNyf4PKYbG084F9UKb782PRKd3yNc7QYi0z/0boq1VOAPxFr2 gDX+Pq1/0EYTHhy0Ys/C8SgR7yEBmbqur/Ay+jIJJwi8CIennTZA/J1AWm+5DQ0235OQUn9wN NgiJzYkgaTbEq6J5qJTutz1EfQd0tGn9IbPBAL5Kc5FCyqNzG1KZ6qtFc4N7QKKpXysGGj+YT 5k+sPGvzDBJqdlwmi8gHYLiWY7fvnKp64AOCb4/R9fur02eVwoTHqCeju3VSSGK76OlUD6zvA pPUeQtHR0ah7wQLeU9v8md5JjjKISNqOPKnGUwgQpZ2iONex+wSvRUFL2h6aagq0CyLaP8Gfq zmXWCHpEq445f910BUCBeAvU5nvIzU552UTHnndCEkl5ltEoygxJnlsRObI6fx8SHhrxWgg3M zTstUQFdvmLpBDoC12rpm1PBbLltZ0UdeD2KSVYhpJRl9CSaEDUvy8MTHyAMCxWQqIGSB76xZ +PM0B1WZliImyLmV4JN6jDIG7MnD7loZlgv9NDM3YNLBrgQIgmw+3rZM/ok5zNb63xIcmskXa aU0krmuYyo/PeWg== X-Archives-Salt: 2c965f1b-542e-456a-8fbb-d2b069af12b3 X-Archives-Hash: 3bcf22bacd22deee1a46559d16bec659 This patch enhances the ejavadoc function so that it can be called without arguments if the JAVADOC_SRC_DIRS array is set in the ebuild. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 814b4957d52c..31f7932a16fd 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2192,9 +2192,27 @@ ejavadoc() { einfo "javadoc ${javadoc_args} ${@}" fi - local args=( javadoc ${javadoc_args} "${@}" ) - echo "${args[@]}" >&2 - "${args[@]}" || die "ejavadoc failed" + if [[ "${JAVADOC_SRC_DIRS[@]}" ]]; then + mkdir -p target/api || die "cannot create target/api" + local dependency + for dependency in ${JAVADOC_CLASSPATH}; do + classpath="${classpath}:$(java-pkg_getjars \ + --build-only \ + --with-dependencies \ + ${dependency})" + done + find "${JAVADOC_SRC_DIRS[@]}" -name '*.java' > sources + javadoc \ + "${javadoc_args}" \ + -d target/api \ + -cp "${classpath}" \ + -quiet \ + @sources || die "ejavadoc failed" + else + local args=( javadoc ${javadoc_args} "${@}" ) + echo "${args[@]}" >&2 + "${args[@]}" || die "ejavadoc failed" + fi } # @FUNCTION: java-pkg_filter-compiler -- 2.41.0