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 2B77815939F for ; Sun, 14 Jul 2024 15:27:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B74BE2B36; Sun, 14 Jul 2024 15:27:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53674E2B36 for ; Sun, 14 Jul 2024 15:27:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EED29341256 for ; Sun, 14 Jul 2024 15:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C1191E22 for ; Sun, 14 Jul 2024 15:27:15 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1720941739.a681b42cacb145c2aa008c9ca8be15e89f3ac5a5.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/boinc-app.eclass X-VCS-Directories: eclass/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: a681b42cacb145c2aa008c9ca8be15e89f3ac5a5 X-VCS-Branch: master Date: Sun, 14 Jul 2024 15:27:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19876954-d26a-40a4-a1ec-cf152997224d X-Archives-Hash: 9a08ace98bd6a422227d211527fee15f commit: a681b42cacb145c2aa008c9ca8be15e89f3ac5a5 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Jul 9 15:33:40 2024 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Sun Jul 14 07:22:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a681b42c boinc-app.eclass: rename doappinfo → boinc_install_appinfo Use the same naming style as in "boinc_install_wrapper". "doappinfo" is kept for compatibility but deprecated and will be removed sooner or later. Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/boinc-app.eclass | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/eclass/boinc-app.eclass b/eclass/boinc-app.eclass index 689be4992..a20c800cb 100644 --- a/eclass/boinc-app.eclass +++ b/eclass/boinc-app.eclass @@ -173,8 +173,8 @@ boinc-app_appinfo_prepare() { || die "app_info.xml sed failed" } -# @FUNCTION: doappinfo -# @USAGE: +# @FUNCTION: boinc_install_appinfo +# @USAGE: # @DESCRIPTION: # Installs given app_info.xml file to the project root. # @@ -191,36 +191,45 @@ boinc-app_appinfo_prepare() { # } # # src_install() { -# doappinfo "${FILESDIR}"/app_info_${PV}.xml +# boinc_install_appinfo "${FILESDIR}"/app_info_1.0.xml # # exeinto $(get_project_root) # exeopts -m 0755 --owner root --group boinc -# newexe bin/${PN} example_app_v${PV} +# newexe bin/${PN} example_app_v1.0 # } # @CODE -doappinfo() { +boinc_install_appinfo() { debug-print-function ${FUNCNAME} "${@}" (( $# == 1 )) || \ die "${FUNCNAME} takes exactly one argument" - cp "$1" "${T}"/app_info.xml || die + cp "${1:?}" "${T:?}"/app_info.xml || die if declare -f appinfo_prepare >/dev/null; then - appinfo_prepare "${T}"/app_info.xml + appinfo_prepare "${T:?}"/app_info.xml else - boinc-app_appinfo_prepare "${T}"/app_info.xml + boinc-app_appinfo_prepare "${T:?}"/app_info.xml fi ( # subshell to avoid pollution of calling environment - insinto $(get_project_root) + insinto "$(get_project_root)" insopts -m 0644 --owner root --group boinc - doins "${T}"/app_info.xml + doins "${T:?}"/app_info.xml ) || die "failed to install app_info.xml" _boinc-app_fix_permissions } +# @FUNCTION: doappinfo +# @DEPRECATED: boinc_install_appinfo +# @USAGE: +# @DESCRIPTION: +# Installs given app_info.xml file to the project root. +doappinfo() { + boinc_install_appinfo "${@}" +} + # @FUNCTION: boinc-app_foreach_wrapper_job # @USAGE: # @DESCRIPTION: @@ -256,7 +265,7 @@ boinc-app_foreach_wrapper_job() { # meson_src_install # # boinc_install_wrapper boinc-example_wrapper "${FILESDIR}"/job.xml -# doappinfo "${FILESDIR}"/app_info_${PV}.xml +# boinc_install_appinfo "${FILESDIR}"/app_info_1.0.xml # } # @CODE #