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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE14015800F for ; Sat, 7 Jan 2023 06:07:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F684E07E6; Sat, 7 Jan 2023 06:07:07 +0000 (UTC) Received: from sysrq.in (sysrq.in [37.79.202.136]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 80097E07DB for ; Sat, 7 Jan 2023 06:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=sysrq.in; bh=TV8kTdR/FPs v2L+nf6AFu9rvq2zZfbcq7Muoo19+9F4=; h=in-reply-to:references:to:from: date; d=sysrq.in; b=Q513xEgU+SrS9EXYDNvMAtevh75Zf9Tlg/tYRCCdswCwAzMxO6 WP4iSzNA0z58hYtxKCWcXBFgGuD0VQppyji1wXzRrUVwAkLdmlzYnD/1RGNHKyZQaRQvwn fJRP91lL0Zoui12UAm+B5xLnmFK7j24R8EsDExjBvmg27TaNNi9BtFueKE2f4L/Qansrj8 JpNZDkI5HzKCdGPmRnNuvcRIt2TCmJuUa/B6LIH9vT+LPLUOIq0lhJJPUva3kQ+Du/5PBY x1OxpvPOM+HIB5ZG+vSzmoXZjWoDNDGYsWfxgguwVq5mSW1WkE71VoGS5L8eOHl9lmRCJZ TV9WfIEfOHTQ== Received: from sysrq.in (localhost [127.0.0.1]) by sysrq.in (OpenSMTPD) with ESMTPS id 135afe1a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 7 Jan 2023 06:07:03 +0000 (UTC) Date: Sat, 7 Jan 2023 11:07:02 +0500 From: Anna To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] gradle.eclass: add new eclass Message-ID: Mail-Followup-To: gentoo-dev@lists.gentoo.org References: <20230106172051.274199-1-flow@gentoo.org> <20230106172051.274199-2-flow@gentoo.org> 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230106172051.274199-2-flow@gentoo.org> User-Agent: Mutt/2.2.9 (2022-11-12) X-Archives-Salt: db72768c-b0c1-46ba-a5ed-f7acdb847605 X-Archives-Hash: 7f2c210f2b0ab583aa63b15a9c95bb9b On 2023-01-06 18:20, Florian Schmaus wrote: > Signed-off-by: Florian Schmaus > --- > eclass/gradle.eclass | 149 +++++++++++++++++++++++++++++++++++++++++ > eclass/tests/gradle.sh | 62 +++++++++++++++++ > 2 files changed, 211 insertions(+) > create mode 100644 eclass/gradle.eclass > create mode 100755 eclass/tests/gradle.sh > > diff --git a/eclass/gradle.eclass b/eclass/gradle.eclass > new file mode 100644 > index 000000000000..a321262612d0 > --- /dev/null > +++ b/eclass/gradle.eclass > @@ -0,0 +1,149 @@ > +# Copyright 2021-2023 Gentoo Authors > +# Distributed under the terms of the GNU General Public License v2 > + > +# @ECLASS: gradle.eclass I think "gradle-utils" is a better name since the eclass does not export any phase functions or set metadata variables (this should be noted in the description btw). > +# @MAINTAINER: > +# Gentoo Java Project > +# @AUTHOR: > +# Florian Schmaus > +# @BLURB: Utility functions for the gradle build system. First letter should not be capitalized (for manpage reasons). > +# @DESCRIPTION: > +# Utility functions for the gradle build system. Either drop description or don't repeat blurb here. > + > +case ${EAPI} in > + 7|8) ;; > + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; > +esac > + > +if [[ -z ${_GRADLE_ECLASS} ]] ; then > +_GRADLE_ECLASS=1 > + > +inherit edo > + > +# @ECLASS_VARIABLE: EGRADLE_MIN > +# @DEFAULT_UNSET > +# @DESCRIPTION: > +# Minimum required gradle version. > + > +# @ECLASS_VARIABLE: EGRADLE_MAX_EXCLUSIVE > +# @DEFAULT_UNSET > +# @DESCRIPTION: > +# First gradle version that is not supported. > + > +# @ECLASS_VARIABLE: EGRADLE_EXACT_VER > +# @DEFAULT_UNSET > +# @DESCRIPTION: > +# The exact required gradle version. > + > +# @ECLASS_VARIABLE: EGRADLE_PARALLEL > +# @DESCRIPTION: > +# Set to the 'true', the default, to invoke gradle with --parallel. Set > +# to 'false' to disable parallel gradle builds. > +: "${EGRADLE_PARALLEL=true}" Can be deduced indeirectly (when "makeopts_jobs" equals to 1). > + > +# @ECLASS_VARIABLE: EGRADLE_USER_HOME > +# @DESCRIPTION: > +# Directroy used as the user's home directory by gradle. Defaults to > +# ${T}/gradle_user_home > +: "${EGRADLE_USER_HOME="${T}/gradle_user_home"}" Can it be just ${HOME}? > + > +# @ECLASS_VARIABLE: EGRADLE_OVERWRITE > +# @USER_VARIABLE > +# @DEFAULT_UNSET > +# @DESCRIPTION: > +# User-specified overwrite of the used gradle binary. > + > +# @FUNCTION: gradle-set_EGRADLE > +# @DESCRIPTION: > +# Set the EGRADLE environment variable. > +gradle-set_EGRADLE() { > + [[ -n ${EGRADLE} ]] && return > + > + if [[ -n ${EGRADLE_OVERWRITE} ]]; then > + export EGRADLE="${EGRADLE_OVERWRITE}" Any reason to export? > + return > + fi > + > + local candidates candidate selected selected_ver > + > + candidates=$(compgen -c gradle-) > + for candidate in ${candidates}; do > + if [[ ! ${candidate} =~ gradle(-bin)?-([.0-9]+) ]]; then > + continue > + fi > + > + local ver > + if (( ${#BASH_REMATCH[@]} == 3 )); then > + ver="${BASH_REMATCH[2]}" > + else > + ver="${BASH_REMATCH[1]}" > + fi > + > + if [[ -n ${EGRADLE_EXACT_VER} ]]; then > + ver_test "${ver}" -ne "${EGRADLE_EXACT_VER}" && continue > + > + selected="${candidate}" > + selected_ver="${ver}" > + break > + fi > + > + if [[ -n ${EGRADLE_MIN} ]] \ > + && ver_test "${ver}" -lt "${EGRADLE_MIN}"; then > + # Candidate does not satisfy EGRADLE_MIN condition. > + continue > + fi > + > + if [[ -n ${EGRADLE_MAX_EXCLUSIVE} ]] \ > + && ver_test "${ver}" -ge "${EGRADLE_MAX_EXCLUSIVE}"; then > + # Candidate does not satisfy EGRADLE_MAX_EXCLUSIVE condition. > + continue > + fi > + > + if [[ -n ${selected_ver} ]] \ > + && ver_test "${selected_ver}" -gt "${ver}"; then > + # Candidate is older than the currently selected candidate. > + continue > + fi > + > + selected="${candidate}" > + selected_ver="${ver}" > + done > + > + if [[ -z ${selected} ]]; then > + die "Could not find (suitable) gradle installation in PATH" > + fi > + > + export EGRADLE="${selected}" > + export EGRADLE_VER="${ver}" > +} > + > +# @FUNCTION: egradle > +# @USAGE: [gradle-args] > +# @DESCRIPTION: > +# Invoke gradle with the optionally provided arguments. > +egradle() { > + gradle-set_EGRADLE > + > + local gradle_args=( > + --console=plain > + --info > + --stacktrace > + --no-daemon > + --offline > + --no-build-cache > + --gradle-user-home "${EGRADLE_USER_HOME}" > + --project-cache-dir "${T}/gradle_project_cache" > + ) > + > + if $EGRADLE_PARALLEL; then ${Braces} > + gradle_args+=( --parallel ) > + fi > + > + local -x JAVA_TOOL_OPTIONS="-Duser.home=\"$T\"" ${Braces} > + # TERM needed, otherwise gradle may fail on terms it does not know about > + TERM=xterm \ > + edo \ > + "${EGRADLE}" "${gradle_args[@]}" "${@}" > +} > + > +fi > diff --git a/eclass/tests/gradle.sh b/eclass/tests/gradle.sh > new file mode 100755 > index 000000000000..61666c1bc60e > --- /dev/null > +++ b/eclass/tests/gradle.sh > @@ -0,0 +1,62 @@ > +#!/usr/bin/env bash > +# Copyright 2022-2023 Gentoo Authors > +# Distributed under the terms of the GNU General Public License v2 > + > +EAPI=8 > + > +SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) > +cd "${SCRIPT_DIR}" > + > +source tests-common.sh || exit > + > +inherit gradle > + > +# TODO: hack because tests-common don't implement ver_cut > +EAPI=6 inherit eapi7-ver > + > +test_set_EGRADLE() { > + local expected_EGRADLE="${1}" > + > + shift > + > + local tmpdir > + tmpdir=$(mktemp -d || die) > + for pseudo_gradle in "${@}"; do > + local pseudo_gradle_path="${tmpdir}/${pseudo_gradle}" > + touch "${pseudo_gradle_path}" > + chmod 755 "${pseudo_gradle_path}" > + done > + > + local saved_PATH="${PATH}" > + PATH="${tmpdir}" > + > + local test_desc=( > + test_set_EGRADLE > + ) > + [[ -v EGRADLE_MIN ]] && test_desc+=( "EGRADLE_MIN=${EGRADLE_MIN}" ) > + [[ -v EGRADLE_MAX_EXCLUSIVE ]] && test_desc+=( "EGRADLE_MAX_EXCLUSIVE=${EGRADLE_MAX_EXCLUSIVE}" ) > + test_desc+=( $@ ) > + > + tbegin "${test_desc[@]}" > + gradle-set_EGRADLE > + > + local saved_EGRADLE="${EGRADLE}" > + unset EGRADLE > + > + PATH="${saved_PATH}" > + rm -rf "${tmpdir}" > + > + [[ "${saved_EGRADLE}" == "${expected_EGRADLE}" ]] > + tend $? > + > + if (( $? > 0 )); then > + >&2 echo -e "\t expected=${expected_EGRADLE} actual=${saved_EGRADLE}" > + fi > +} > + > +test_set_EGRADLE gradle-2.0 gradle-1.0 gradle-2.0 > +EGRADLE_MIN=2.0 test_set_EGRADLE gradle-2.2.3 gradle-1.0 gradle-2.0 gradle-2.2.3 > +EGRADLE_MAX_EXCLUSIVE=2.2 test_set_EGRADLE gradle-2.0 gradle-1.0 gradle-2.0 gradle-2.2.3 > + > + > +texit > -- > 2.38.2 > >