eclass/java-utils-2: Sync with Gentoo

It's from Gentoo commit b4811e07c355f6baa89d7581fe233fd57e63293a.
This commit is contained in:
Flatcar Buildbot 2025-01-13 07:07:44 +00:00 committed by Krzesimir Nowak
parent ea9794c405
commit d2cdf693ca

View File

@ -213,6 +213,48 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
# ebuild foo.ebuild compile
# @CODE
# @ECLASS_VARIABLE: EBUILD_DEATH_HOOKS
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used internally.
# @ECLASS_VARIABLE: JAVA_PKG_BUILD_DEPEND_FILE
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_
# @ECLASS_VARIABLE: JAVA_PKG_DEPEND_FILE
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_
# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used in java-pkg_register-environment-variable and java-pkg_do_write_,
# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV_VARS
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used in java-pkg_register-environment-variable and java-pkg_do_write_
# @ECLASS_VARIABLE: JAVA_PKG_OPTIONAL_DEPEND_FILE
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Used in java-pkg_do_write_ and java-pkg_record-jar_
# @ECLASS_VARIABLE: WANT_JAVA_CONFIG
# @INTERNAL
# @DEFAULT_UNSET
# @DESCRIPTION:
# Gets exported to make sure we use java-config-2
# @ECLASS_VARIABLE: JAVADOC_CLASSPATH
# @DEFAULT_UNSET
# @DESCRIPTION:
@ -253,9 +295,6 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
# )
# @CODE
# TODO document me
JAVA_PKG_QA_VIOLATIONS=0
# @FUNCTION: java-pkg_doexamples
# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
# @DESCRIPTION:
@ -1942,7 +1981,6 @@ etestng() {
-cp ${cp}
-Djava.io.tmpdir="${T}"
-Djava.awt.headless=true
-Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}"
${JAVA_TEST_EXTRA_ARGS[@]}
${runner}
${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}
@ -2785,19 +2823,6 @@ java-pkg_die() {
}
# TODO document
# List jars in the source directory, ${S}
java-pkg_jar-list() {
if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
einfo "Linked Jars"
find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
einfo "Jars"
find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
einfo "Classes"
find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
fi
}
# @FUNCTION: java-pkg_verify-classes
# @INTERNAL
# @DESCRIPTION:
@ -2959,16 +2984,9 @@ java-pkg_announce-qa-violation() {
nodie="true"
shift
fi
echo "Java QA Notice: $@" >&2
increment-qa-violations
[[ -z "${nodie}" ]] && is-java-strict && die "${@}"
}
increment-qa-violations() {
let "JAVA_PKG_QA_VIOLATIONS+=1"
export JAVA_PKG_QA_VIOLATIONS
}
# @FUNCTION: is-java-strict
# @INTERNAL
# @RETURN: 0: JAVA_PKG_STRICT is set