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 1491B158009 for ; Wed, 28 Jun 2023 07:53:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26BB4E096C; Wed, 28 Jun 2023 07:52:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 CC6C9E0969 for ; Wed, 28 Jun 2023 07:52:58 +0000 (UTC) From: Florian Schmaus To: gentoo-dev@lists.gentoo.org Cc: Florian Schmaus Subject: [gentoo-dev] [PATCH 2/2] dev-java/openjfx: switch to gradle.eclass Date: Wed, 28 Jun 2023 09:52:45 +0200 Message-Id: <20230628075245.892402-3-flow@gentoo.org> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230628075245.892402-1-flow@gentoo.org> References: <20230106172051.274199-1-flow@gentoo.org> <20230628075245.892402-1-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-Transfer-Encoding: 8bit X-Archives-Salt: c48baf40-547d-4a59-a8b6-eaf7ab0a0159 X-Archives-Hash: 583a61ea5150e20b3014017d5dada80d Signed-off-by: Florian Schmaus --- dev-java/openjfx/openjfx-11.0.11_p1.ebuild | 46 +++++++--------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild index 7d61ff67f2c2..a99111598f7c 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild @@ -1,19 +1,19 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.10.3" +EGRADLE_BUNDLED_VER="4.10.3" -inherit flag-o-matic java-pkg-2 multiprocessing +inherit flag-o-matic gradle java-pkg-2 multiprocessing DESCRIPTION="Java OpenJFX client application platform" HOMEPAGE="https://openjfx.io" -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip +SRC_URI=" + https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar @@ -22,6 +22,7 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar + $(gradle-src_uri) " LICENSE="GPL-2-with-classpath-exception" @@ -84,28 +85,8 @@ PATCHES=( S="${WORKDIR}/rt-${MY_PV}" -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - # TERM needed, otherwise gradle may fail on terms it does not know about - TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} +# Fails to build if gradle is invoked with --parallel. +EGRADLE_PARALLEL=false pkg_setup() { JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" @@ -148,7 +129,7 @@ pkg_setup() { src_unpack() { unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" + gradle-src_unpack mkdir "${T}/jars" || die @@ -171,7 +152,7 @@ src_prepare() { java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die + sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" build.gradle || die } src_configure() { @@ -189,7 +170,7 @@ src_configure() { [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" fi - cat <<- _EOF_ > "${S}"/gradle.properties + cat <<- _EOF_ > gradle.properties COMPILE_TARGETS = linux COMPILE_WEBKIT = false COMPILE_MEDIA = $(usex media true false) @@ -206,6 +187,9 @@ src_configure() { } src_compile() { + # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist + unset ANT_HOME + egradle zips $(usex doc "" "--exclude-task javadoc") } -- 2.39.3