mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 08:58:27 -07:00
dev-java/protobuf-java: drop 3.21.9-r1, 3.21.9-r2
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29509 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
committed by
Sam James
Sam James
parent
cb8fe581f0
commit
f82b0ef2df
@@ -1,3 +1,2 @@
|
||||
DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
|
||||
DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
|
||||
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
# 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.21.9"
|
||||
# Tests not enabled, depend on com.google.truth which is not packaged
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L35-L40
|
||||
# JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit edo java-pkg-2 java-pkg-simple
|
||||
|
||||
PARENT_PN="${PN/-java/}"
|
||||
PARENT_PV="$(ver_cut 2-)"
|
||||
PARENT_P="${PARENT_PN}-${PARENT_PV}"
|
||||
PARENT_SUBSLOT="32"
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Java bindings"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/"
|
||||
SRC_URI="
|
||||
https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
|
||||
-> ${PARENT_P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.8:*
|
||||
test? (
|
||||
dev-java/guava:0
|
||||
dev-java/mockito:4
|
||||
)
|
||||
"
|
||||
RDEPEND=">=virtual/jre-1.8:*"
|
||||
|
||||
BDEPEND="dev-libs/protobuf:0/${PARENT_SUBSLOT}"
|
||||
|
||||
S="${WORKDIR}/${PARENT_P}/java"
|
||||
|
||||
JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
|
||||
JAVA_JAR_FILENAME="protobuf.jar"
|
||||
JAVA_RESOURCE_DIRS="core/src/main/resources"
|
||||
JAVA_SRC_DIR="core/src/main/java"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
|
||||
JAVA_TEST_RESOURCE_DIRS="../src"
|
||||
JAVA_TEST_SRC_DIR="core/src/test/java"
|
||||
|
||||
# Same than PATCHES but from repository's root directory,
|
||||
# please see function `src_prepare` below.
|
||||
# Simplier for users IMHO.
|
||||
PARENT_PATCHES=(
|
||||
)
|
||||
|
||||
# Here for patches within "java/" subdirectory.
|
||||
PATCHES=(
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
|
||||
[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
|
||||
eapply_user
|
||||
popd > /dev/null || die
|
||||
|
||||
# Same than default without the eapply_user part, this last is kept
|
||||
# for the parent directory.
|
||||
# It looks like function java-pkg-2_src_prepare doesn’t call "default".
|
||||
[[ -n "${PATCHES[@]}" ]] && eapply "${PATCHES[@]}"
|
||||
|
||||
# Remove bundled jars
|
||||
java-pkg_clean
|
||||
|
||||
java-pkg-2_src_prepare
|
||||
|
||||
# There is also compiler/plugin, but not in this list because in a subdirectory
|
||||
core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
|
||||
|
||||
# Copy resources from ../src/google/protobuf according to
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L45-L61
|
||||
mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
|
||||
local core_proto
|
||||
for core_proto in "${core_protos[@]}"; do
|
||||
cp "../src/google/protobuf/${core_proto}.proto" \
|
||||
"${JAVA_RESOURCE_DIRS}/google/protobuf" \
|
||||
|| die
|
||||
done
|
||||
cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
|
||||
|
||||
# Generate 146 .java files according to
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml
|
||||
for core_proto in "${core_protos[@]}" compiler/plugin; do
|
||||
edo "${BROOT}/usr/bin/protoc" \
|
||||
--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
|
||||
done
|
||||
}
|
||||
@@ -1,119 +0,0 @@
|
||||
# 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.21.9"
|
||||
JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Java bindings"
|
||||
HOMEPAGE="https://developers.google.com/protocol-buffers/"
|
||||
# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
|
||||
# And we build artifact 3.21.9 from the 21.9 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 )"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.8:*
|
||||
test? (
|
||||
dev-java/guava:0
|
||||
dev-java/mockito:4
|
||||
)
|
||||
"
|
||||
RDEPEND=">=virtual/jre-1.8:*"
|
||||
BDEPEND="~dev-libs/protobuf-${PV#3.}:0"
|
||||
|
||||
S="${WORKDIR}/protobuf-${PV#3.}/java"
|
||||
|
||||
JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
|
||||
JAVA_JAR_FILENAME="protobuf.jar"
|
||||
JAVA_RESOURCE_DIRS="core/src/main/resources"
|
||||
JAVA_SRC_DIR="core/src/main/java"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
|
||||
JAVA_TEST_RESOURCE_DIRS="core/src/test/proto"
|
||||
JAVA_TEST_SRC_DIR="core/src/test/java"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mkdir "${JAVA_RESOURCE_DIRS}" || die
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L43-L62
|
||||
echo $(sed \
|
||||
-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:-C ../../../../../src \1:p' \
|
||||
"${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed"
|
||||
# Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS
|
||||
pushd "${JAVA_RESOURCE_DIRS}" || die
|
||||
jar cv "@${T}/core_proto" | jar xv
|
||||
assert "Copying protos failed"
|
||||
popd || die
|
||||
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml
|
||||
einfo "Replace variables for code generation "
|
||||
sed \
|
||||
-e 's:${generated.sources.dir}:core/src/main/java:' \
|
||||
-e 's:${protobuf.source.dir}:../src:' \
|
||||
-e 's:^.*value="::' -e 's:\"/>::' \
|
||||
-e '/project\|echo\|mkdir\|exec/d' \
|
||||
-i core/generate-sources-build.xml || die "sed to sources failed"
|
||||
|
||||
einfo "Run protoc to generate sources"
|
||||
protoc @core/generate-sources-build.xml || die "protoc sources failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
|
||||
|
||||
# https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-test-sources-build.xml
|
||||
einfo "Replace variables for code generation "
|
||||
sed \
|
||||
-e 's:${generated.testsources.dir}:core/src/test/java:' \
|
||||
-e 's:${protobuf.source.dir}:../src:' \
|
||||
-e 's:${test.proto.dir}:core/src/test/proto:' \
|
||||
-e 's:^.*value="::' -e 's:\"/>::' \
|
||||
-e '/project\|mkdir\|exec\|Also generate/d' \
|
||||
-i core/generate-test-sources-build.xml || die "sed to test sources failed"
|
||||
|
||||
# Remove second exec from the file. Makes trouble here. We run it separately.
|
||||
sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines"
|
||||
|
||||
einfo "Running protoc first exec"
|
||||
protoc @core/generate-test-sources-build.xml || die "protoc I failed"
|
||||
|
||||
einfo "Running protoc second exec"
|
||||
protoc --java_out=lite:core/src/test/java \
|
||||
--proto_path=../src \
|
||||
--proto_path=core/src/test/proto \
|
||||
core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \
|
||||
core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \
|
||||
|| die "protoc II failed"
|
||||
|
||||
# Ignore two failing test cases from CodedOutputStreamTest.java
|
||||
sed \
|
||||
-e '/import org.junit.Test/a import org.junit.Ignore;' \
|
||||
-e '/testWriteWholeMessage/i @Ignore' \
|
||||
-e '/testWriteWholePackedFieldsMessage/i @Ignore' \
|
||||
-i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die
|
||||
|
||||
einfo "Running tests"
|
||||
# Exclude MapInitializationOrderTest and CachedFieldSizeTest
|
||||
pushd core/src/test/java || die
|
||||
local JAVA_TEST_RUN_ONLY=$(find * \
|
||||
-wholename "**/*Test.java" \
|
||||
! -wholename "**/Abstract*Test.java" \
|
||||
! -name "MapInitializationOrderTest.java" \
|
||||
! -name "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
|
||||
}
|
||||
Reference in New Issue
Block a user