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 31E92158013 for ; Thu, 7 Dec 2023 13:05:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54C6F2BC015; Thu, 7 Dec 2023 13:05:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 34B5F2BC015 for ; Thu, 7 Dec 2023 13:05:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 7269633E02F for ; Thu, 7 Dec 2023 13:05:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04C5D1445 for ; Thu, 7 Dec 2023 13:05:42 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1701954331.4932f20d613a5335de43746b09e582de9b6a3a8f.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/protobuf-java/Manifest dev-java/protobuf-java/protobuf-java-3.23.3.ebuild X-VCS-Directories: dev-java/protobuf-java/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 4932f20d613a5335de43746b09e582de9b6a3a8f X-VCS-Branch: master Date: Thu, 7 Dec 2023 13:05:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9618be6e-2101-4201-b3bb-6a0ad4ecbf82 X-Archives-Hash: 6d6c5469a9475506784734716f4fe95e commit: 4932f20d613a5335de43746b09e582de9b6a3a8f Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Oct 12 10:50:03 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Dec 7 13:05:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4932f20d dev-java/protobuf-java: add 3.23.3 - older version to allow system-protoc Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/protobuf-java/Manifest | 1 + dev-java/protobuf-java/protobuf-java-3.23.3.ebuild | 164 +++++++++++++++++++++ 2 files changed, 165 insertions(+) diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 60307769f3dc..9f43d5ad393a 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,3 +1,4 @@ DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d +DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b DIST protobuf-24.2.tar.gz 5179130 BLAKE2B a1e3da4e95072391fa4abf671a9eb77806f1b3864219e1e0c024156558e2ecd9e3cabee367efaf15626a199ae413dced3f29f601820611d37dd733c92ffc06c0 SHA512 fee9f5fc0e615e49347320e37b560112f43d13c63050701e25b3348e9d4aa59e80c7d810f7da12764b1b9eeee8efa35be7743c5ebbb0a12c78f5924f1544c356 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild new file mode 100644 index 000000000000..484bbc788521 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild @@ -0,0 +1,164 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.23.3 from the 23.3 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${PV#3.}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) +" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + default # apply patches + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L43-L62 + PROTOS=( $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):\1:p' \ + "${S}/java/core/pom.xml") ) || die + pushd src > /dev/null || die + cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die + popd > /dev/null || die + + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +}