commit: a681b42cacb145c2aa008c9ca8be15e89f3ac5a5
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Jul 9 15:33:40 2024 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
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 <cyber+gentoo <AT> 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: <app_info.xml>
+# @FUNCTION: boinc_install_appinfo
+# @USAGE: <app_info>
# @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: <app_info>
+# @DESCRIPTION:
+# Installs given app_info.xml file to the project root.
+doappinfo() {
+ boinc_install_appinfo "${@}"
+}
+
# @FUNCTION: boinc-app_foreach_wrapper_job
# @USAGE: <job>
# @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
#
