aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Schmaus <flow@gentoo.org>2023-01-06 14:30:52 +0100
committerFlorian Schmaus <flow@gentoo.org>2023-01-06 14:30:52 +0100
commit8c794b05f3f68c2bbf2a7eb3b568d08c538fdb47 (patch)
treecf8897e4d99f4a697ec01cfd13daa95595f3a9fe
parenteclass/tests: allow gradle.sh to be invoked from any directory (diff)
downloadjava-8c794b05f3f68c2bbf2a7eb3b568d08c538fdb47.tar.gz
java-8c794b05f3f68c2bbf2a7eb3b568d08c538fdb47.tar.bz2
java-8c794b05f3f68c2bbf2a7eb3b568d08c538fdb47.zip
gradle.eclass: update
Signed-off-by: Florian Schmaus <flow@gentoo.org>
-rw-r--r--eclass/gradle.eclass20
1 files changed, 15 insertions, 5 deletions
diff --git a/eclass/gradle.eclass b/eclass/gradle.eclass
index ad7b1440..09eda636 100644
--- a/eclass/gradle.eclass
+++ b/eclass/gradle.eclass
@@ -32,6 +32,11 @@ inherit edo
# @DESCRIPTION:
# First gradle version that is not supported.
+# @ECLASS_VARIABLE: EGRADLE_USER_HOME
+# @DESCRIPTION:
+# Directroy used the user's home directory by gradle.
+EGRADLE_USER_HOME="${T}/gradle_user_home"
+
# @ECLASS_VARIABLE: EGRADLE_OVERWRITE
# @USER_VARIABLE
# @DEFAULT_UNSET
@@ -66,7 +71,7 @@ gradle-set_EGRADLE() {
if [[ -n ${EGRADLE_MIN} ]] \
&& ver_test "${ver}" -lt "${EGRADLE_MIN}"; then
- # Candidate does not stisfy EGRADLE_MIN condition.
+ # Candidate does not satisfy EGRADLE_MIN condition.
continue
fi
@@ -96,8 +101,8 @@ gradle-set_EGRADLE() {
# @FUNCTION: egradle
# @USAGE: [gradle-args]
-# @DESCRIPTION
-# Invoke gradle
+# @DESCRIPTION:
+# Invoke gradle with the optionally provided arguments.
egradle() {
gradle-set_EGRADLE
@@ -108,12 +113,17 @@ egradle() {
--stacktrace
--no-daemon
--offline
+ --parallel
--no-build-cache
- --gradle-user-home "${T}/gradle_user_home"
+ --gradle-user-home "${EGRADLE_USER_HOME}"
--project-cache-dir "${T}/gradle_project_cache"
)
- edo "${EGRADLE}" "${gradle_args[@]}" ${@}
+ local -x JAVA_TOOL_OPTIONS="-Duser.home=\"$T\""
+ # TERM needed, otherwise gradle may fail on terms it does not know about
+ TERM=xterm \
+ edo \
+ "${EGRADLE}" "${gradle_args[@]}" ${@}
}
fi