diff options
Diffstat (limited to 'dev-util/visualvm')
| -rw-r--r-- | dev-util/visualvm/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/visualvm/visualvm-2.1.10.ebuild (renamed from dev-util/visualvm/visualvm-2.1.9.ebuild) | 29 | ||||
| -rw-r--r-- | dev-util/visualvm/visualvm-2.1.8.ebuild | 150 |
3 files changed, 27 insertions, 158 deletions
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest index 47e169f157d7..b1188123c8ef 100644 --- a/dev-util/visualvm/Manifest +++ b/dev-util/visualvm/Manifest @@ -1,8 +1,6 @@ AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb DIST nashorn-core-15.4.jar 2167292 BLAKE2B f40349e9f369eed1bb3795622ffe9353c98f35df1d5c2f5f3845d8f1fd5ecea553e11da15d17b9083f6ae2efa4485df131a9a9216499f1c7d440ca4b1d772a2b SHA512 3b560e1ae67d5d5d19250849dee3f813d2c801e56ba85d90439a067378a47f95020910da85b7c8afb6675ea2e25cd274953483efd07e89097656aadc804c8020 DIST nb190_platform_20231030.zip 26056691 BLAKE2B 7815c08ad60515e8018336452e24c2fb0743d1ef48c58ffd80d371000fa664f8f0053a4c1d56a012b9e50f6714a44c300a915061afebd586f9438abae7867447 SHA512 779256d678c9a13dde4314a5771480c450ae86c49e80ac99eb90a4e9e32e3bc5759128f60a610aecc3ce9e7dbce56b0076b528c8f18a682ebac2dd74cb5a6eea -DIST visualvm-2.1.8.tar.gz 11630256 BLAKE2B 503866654d969ef127455ce6d3c5d087c7543e100cb8bd8712d15dc3d0530ee3fd31ee571837be9dfe99cb01cbf0ebf7a29084cb16b80d9ebbf5ebc2654f945b SHA512 34329db8be5ab6727d1500e4a7bb07af704c6f815912418bd5fa0a872671f53237054c8fc13129124e5bb8c953bc31a47bb7c857962aa9ed080f16d2b6965331 -DIST visualvm-2.1.9.tar.gz 11781212 BLAKE2B e924134e211a7f0a95d299f21dab2fff35fb0c0f646ea25adc0eb1204628fbec752075380dc6f717ff902f566040cf9ed8186b1470f9277d39742e288142de67 SHA512 ed950c6216185b9d09ed0605729cd02b649df32fef0f204066419bf96f61f63887b7bad082e5434e740f23856270be2b5c0bd35aa825511cb35486059592b3e7 -EBUILD visualvm-2.1.8.ebuild 5699 BLAKE2B 29dc5dfa09f8810b36fc70e2015b98a67fc5d11b9d91971a5badf527202928ab3fde641ef2dbb55acc930ea436399cfdc0439961d1ca34f6cca3c98dbee446e6 SHA512 ea1e5d7fc905b73fba9d2c7d8447bef1532258c0da4b7d15e8387b61bfc005d054c1b8daca86bf5d72ff5b818b1b79aaf441f31d00f9138d0506d048c5ddabdd -EBUILD visualvm-2.1.9.ebuild 5804 BLAKE2B 763702112f2a2bed8b3c1f0b81d26d18199443d8f81281fa50179a096d314497066d5cf9376f2ab94c9bc85bd0bcbf42efb566e28643b3bd78714834deffc513 SHA512 81cb2a1cf8b75de99df69bf6f4c2d6faecd38ed9f2853b26899b21831831274a8eb2a23920c1ccb0b7b98165af1e79e255db8f01412e2eb96f523070f8b54909 +DIST visualvm-2.1.10.tar.gz 11782775 BLAKE2B 6c25293fc456cd5add37aa11d623e7a329f31f2608eaf5217a64f014d26a0ab439569edac6367a79102c3d89fe88182bd9ac56edf96aac515b6b6146eaf70a25 SHA512 dd8da529b766c97e8dfc392eafeafb672cd5f74d8a86cb5c4c4385769c5cb1376e7757601d5254de46d7bc5ff705aef0d839692426ffd1a3a10304c3fa90d440 +EBUILD visualvm-2.1.10.ebuild 6508 BLAKE2B b5c4a6f188a28dd3d0af4c5256b5f304063e7a119baebe2ac63d65daa9d62b9283b986b869db7a09e6817dd9ceca02b8c3739a92178a68e6d4da3e28a38d26a4 SHA512 dd1e8dc1a3c930b08518f655364714243ad0c1de1775cab778c66d2abb80de3904cb3190d54f434d385cb7d063f9704b70c19d8942cb2fcc441e2ec3894abc6b MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c diff --git a/dev-util/visualvm/visualvm-2.1.9.ebuild b/dev-util/visualvm/visualvm-2.1.10.ebuild index 4a81848ea960..a8d9182181f0 100644 --- a/dev-util/visualvm/visualvm-2.1.9.ebuild +++ b/dev-util/visualvm/visualvm-2.1.10.ebuild @@ -30,8 +30,8 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-2-with-linking-exception" -SLOT="7" -KEYWORDS="~amd64" +SLOT="0" +KEYWORDS="amd64" BDEPEND=" app-arch/unzip @@ -45,6 +45,7 @@ COMMON_DEPEND=" " # it does not compile with java 11 +# not even after removing hardcoded -source and -target values DEPEND=" ${COMMON_DEPEND} virtual/jdk:1.8 @@ -52,6 +53,7 @@ DEPEND=" RDEPEND=" ${COMMON_DEPEND} + !dev-util/visualvm:7 dev-java/asm:9 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 @@ -100,13 +102,32 @@ src_prepare() { || die "Failed to link lz4 java jar" java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \ || die "Failed to link owasp-java-encoder jar" + + # remove hardcoded javac's source & target settings + cd .. || die + find -name build.xml \ + -exec sed -Ei 's,(source|target)="1.5",,g' {} + || + die "remove javac's source & target in build.xml files" + + cd .. || die + find -name build.xml \ + -exec sed -Ei 's,(source|target)="1.4",,g' {} + || + die "remove javac's source & target in build.xml files" + + for prop in $(find -name project.properties); do + sed -e '/javac.source=/d' -e '/javac.target/d' -i ${prop} + done + + for impl in $(find -name build-impl.xml); do + sed -e '/default.javac.source=/d' -e '/default.javac.target/d' -i ${mpl} + done } src_compile() { eant -v \ -Dext.binaries.downloaded=true \ - -Dant.build.javac.source="8" \ - -Dant.build.javac.target="8" \ + -Djavac.source="$(java-pkg_get-source)" \ + -Djavac.target="$(java-pkg_get-target)" \ build } diff --git a/dev-util/visualvm/visualvm-2.1.8.ebuild b/dev-util/visualvm/visualvm-2.1.8.ebuild deleted file mode 100644 index 8f7769ac553c..000000000000 --- a/dev-util/visualvm/visualvm-2.1.8.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -NBV=190 -NBT=20231030 -NBZ=nb${NBV}_platform_${NBT}.zip -ASM_UTIL_VERSION="9.5" -ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar" -FLIGHT_RECORDER_VERSION="8.3.1" -FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar" -COMMON_VERSION="8.3.1" -COMMON_FILE="common-${COMMON_VERSION}.jar" -ENCODER_VERSION="1.2.3" -ENCODER_FILE="encoder-${ENCODER_VERSION}.jar" -LZ4_JAVA_VERSION="1.8.0" -LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar" -NASHORN_CORE_VERSION="15.4" -NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar" - -inherit java-pkg-2 java-ant-2 desktop - -DESCRIPTION="Integrates commandline JDK tools and profiling capabilities" -HOMEPAGE="https://visualvm.github.io" - -SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ} - https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}" -S="${WORKDIR}/${P}/${PN}" - -LICENSE="GPL-2-with-linking-exception" -SLOT="7" -KEYWORDS="amd64" - -COMMON_DEPEND=" - dev-java/jmc:0 - dev-java/lz4-java:0 - dev-java/owasp-java-encoder:0 -" - -RDEPEND=" - ${COMMON_DEPEND} - dev-java/asm:9 - dev-java/hamcrest-core:1.3 - dev-java/jcommander:0 - dev-java/jna:4 - dev-java/junit:4 - dev-java/junit:5 - dev-java/testng:0 - >=virtual/jre-1.8:*" - -# it does not compile with java 11 -DEPEND=" - ${COMMON_DEPEND} - virtual/jdk:1.8" - -BDEPEND="app-arch/unzip" - -QA_PREBUILT=" - /usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so - /usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so - /usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so - /usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so - /usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so - /usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so -" - -EANT_BUILD_TARGET=build -EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true" -INSTALL_DIR=/usr/share/${PN} - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - unpack ${NBZ} -} - -src_prepare() { - default - - # Remove unneeded binaries - rm -rv netbeans/platform/lib/*.{dll,exe} \ - netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die - find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \ - -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die - - # link in external libraries - ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar" - java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \ - || die "Failed to link asm util jar" - java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \ - || die "Failed to link jmc common jar" - java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \ - || die "Failed to link jmc flightrecorder jar" - java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \ - || die "Failed to link lz4 java jar" - java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \ - || die "Failed to link owasp-java-encoder jar" -} - -src_install() { - # this is the visualvm cluster - insinto ${INSTALL_DIR} - doins -r build/cluster netbeans/{harness,platform} - - # configuration file that can be used to tweak visualvm startup parameters - insinto /etc/${PN} - newins launcher/visualvm.conf ${PN}.conf - sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \ - || die "Failed to update userdir" - sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \ - || die "Failed to update cachedir" - echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \ - || die "Failed to set jdk detection" - - # replace bundled stuff - pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die - for name in asm{,-commons,-tree}; do - rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die - done - popd > /dev/null - - pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die - rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die - rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die - for name in jna{,-platform}; do - rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die - done - rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die - for name in junit-jupiter-{api,engine,params}; do - rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die - done - rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die - popd > /dev/null - - pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die - rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die - rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die - rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die - rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die - rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die - popd > /dev/null - - # visualvm runtime script - newbin "${FILESDIR}"/${PN}-r2.sh ${PN} - - # makes visualvm entry - make_desktop_entry ${PN} VisualVM java "Development;Java;" -} |