summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* java-pkg-simple.eclass: allow java-pkg-opt-2Volkmar W. Pogatzki2024-07-231-3/+15
| | | | | | | | | | | | | | Presently, "java-pkg-simple eclass can only be inherited AFTER java-pkg-2". This prevents packages with optional Java like dev-lang/cxprolog to be built with java-pkg-simple. This patch allows to inherit java-pkg-simple after any of java-pkg-2 and java-pkg-opt-2. Poposed by Alfred Wingate on #gentoo-dev-help on 2024-04-25 Closes: https://bugs.gentoo.org/930550 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37468/commits/6f27fbf4604d5504044a7eee3b765ce7efa83089 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: use --module-path for ejavadoc when applicableManuel Mommertz2024-04-101-4/+11
| | | | | | | Bug: https://bugs.gentoo.org/925691 Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de> Closes: https://github.com/gentoo/gentoo/pull/35302 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improve decision when to use --module-pathManuel Mommertz2024-01-191-6/+6
| | | | | | | Closes: https://bugs.gentoo.org/922157 Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de> Closes: https://github.com/gentoo/gentoo/pull/34866 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: cut possible prefix to allow integer comparisonManuel Mommertz2024-01-191-4/+6
| | | | | Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: make code related to java 9+ actually executeManuel Mommertz2024-01-191-5/+5
| | | | | Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: respect JAVADOC_SRC_DIRSVolkmar W. Pogatzki2024-01-111-5/+9
| | | | | | | | | | | This patch helps to avoid useless runs of ejavadoc in multi-jar packages where java-pkg-simple_src_compile is called for each jar file. JAVADOC_SRC_DIRS can be set in the ebuild in global scope and "use doc && ejavadoc" be called at the end of src_compile. And it no longer needs to build a useless "ignoreme.jar". Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improved descriptionMiroslav Šulc2023-10-191-1/+2
| | | | Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improve description of "generated-test"Volkmar W. Pogatzki2023-10-191-3/+6
| | | | | | Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33389 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: avoid reverse dependency for dev-java/testngVolkmar W. Pogatzki2023-10-181-1/+2
| | | | | | | | | | | | Presently, when using testng in JAVA_TESTING_FRAMEWORKS, it gets added to test dependencies. Emerging dev-java/testng with USE=test would lead to a reverse dependency on itself. This change allows emerging / testing testng with the ebuild specifying JAVA_TESTING_FRAMEWORKS="testng" without such reverse dependency. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: avoid removal of generated test classesVolkmar W. Pogatzki2023-10-181-0/+5
| | | | | | | | | | Solution of bug #906311 removes all test classes at beginning of src_test() including test classes generated from the ebuild. With this commit generated test classes will be copied from the new generated-test directory into target/test-classes. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: drop EAPI 6Volkmar W. Pogatzki2023-09-301-2/+1
| | | | | | Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33123 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improve test selection for multi-jar packagesVolkmar W. Pogatzki2023-09-271-1/+3
| | | | | | | | | | | There was a problem with multi-jar packages cumulating tests. Test classes were repeatedly run for all subsequent test runs. With this patch we ensure that classes=target/test-classes is really empty before compilation. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* Revert "java-pkg-simple.eclass: improve test selection for multi-jar packages"Volkmar W. Pogatzki2023-09-271-15/+13
| | | | | | | | This reverts commit 3eb0cfe339e79270446731b8f27bdc1b060d023b. Closes: https://bugs.gentoo.org/906311 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAMEVolkmar W. Pogatzki2023-09-191-1/+5
| | | | | Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: unset variables at end of useSam James2023-05-261-0/+1
| | | | | | | | Reported by Arfrever. Followup to 281d8924745172051af2946f2d8d2df42af1c6b0. Signed-off-by: Sam James <sam@gentoo.org>
* java-pkg-simple.eclass: drop invalid local in global scopeSam James2023-05-261-1/+1
| | | | | | | Thanks to radhermit for reporting. Portage doesn't notice this because it does sourcing in function-scope. Signed-off-by: Sam James <sam@gentoo.org>
* java-pkg-simple.eclass: Quote argument of ":" commandUlrich Müller2023-03-261-3/+3
| | | | | | This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* java-pkg-simple.eclass: MANIFEST.MF show Gentoo in "Created-By: "Volkmar W. Pogatzki2023-02-271-1/+2
| | | | | | | | | | | | Presently, MANIFEST.MF can receive upstream's "Created-By:" if such line is found in a predefined META-INF/MANIFEST.MF in ${JAVA_RESOURCE_DIRS}. This change removes such line before the jar command creates the final MANIFEST.MF putting "Created-By: (Gentoo)" Closes: https://bugs.gentoo.org/897786 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29801 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improve MANIFEST.MF manipulationVolkmar W. Pogatzki2022-10-111-9/+13
| | | | | | | | | | | | | | | For adding Main-class and/or Automatic-module-name to MANIFEST.MF it seems better to use "jar" functionality at the end of compilation. This does the necessary checks and issues warnings in case of duplicate entries. Erroneously used existence checks ( -v ) were causing wrong entries in MANIFEST.MF files in case of JAVA_MAIN_CLASS="" which is often used in multi-jar ebuilds. Closes: https://bugs.gentoo.org/874924 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/27621 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improve test selection for multi-jar packagesVolkmar W. Pogatzki2022-10-031-13/+15
| | | | | | | | | Testing multi-jar packages was not properly supported. With this change the tests_to_run are selected per module. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/27491 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: allow JAVA_MAIN_CLASS _and_ MANIFEST.MFVolkmar W. Pogatzki2022-10-031-8/+9
| | | | | | | | | | | The eclass did not handle JAVA_MAIN_CLASS if there was also a given META-INF/MANIFEST.MF. This change allows adding JAVA_AUTOMATIC_MODULE_NAME and/or JAVA_MAIN_CLASS to the MANIFEST.MF file if it exists or creates one if not. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: run java-pkg_gen-cp only for non-binary packagesVolkmar W. Pogatzki2022-08-021-3/+3
| | | | | | | | | | | | | | app-misc/rundeck-cli-bin-2.0.1 failed to build with openjdk-jre-bin-17 saying "javac is not available for openjdk-jre-bin-17 on x86_64". Culprit was java-pkg-simple.eclass calling java-pkg_gen-cp unconditionally. Limiting java-pkg_gen-cp to the "non-binary" case solves the problem. Closes: https://bugs.gentoo.org/861026 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26647 Signed-off-by: Florian Schmaus <flow@gentoo.org>
* java-pkg-simple.eclass: Inherit eqawarn instead of eutilsUlrich Müller2022-07-241-1/+1
| | | | Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* java-pkg-simple.eclass: Drop support for EAPI 5Ulrich Müller2022-07-241-7/+3
| | | | Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* java-pkg-simple.eclass: Automatic-Module-NameVolkmar W. Pogatzki2022-07-221-0/+12
| | | | | | | | | | | The new variable JAVA_AUTOMATIC_MODULE_NAME can be defined in the ebuild. Its value will be transferred to the MANIFEST.MF of the jar file. Closes: https://bugs.gentoo.org/857468 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26406 Signed-off-by: Florian Schmaus <flow@gentoo.org>
* java-pkg-simple.eclass: invoke einstalldocsFlorian Schmaus2022-07-061-1/+7
| | | | | | | | | On EAPI 6, or newer, invoke einstalldocs in java-pkg-simple_src_install. Closes: https://bugs.gentoo.org/789582 Closes: https://github.com/gentoo/gentoo/pull/26216 Signed-off-by: Florian Schmaus <flow@gentoo.org>
* java-pkg-simple.eclass: eqawarn if module-info.java is not compiledFlorian Schmaus2022-05-051-4/+5
| | | | | | | | | | In preperation of this ewarn part becoming 'die' (bug #842447), switch it to eqawarn to improve catching the affected packages. Bug: https://bugs.gentoo.org/796875 Bug: https://bugs.gentoo.org/842447 Signed-off-by: Florian Schmaus <flow@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/25306
* *.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLEUlrich Müller2022-03-241-19/+19
| | | | | Bug: https://bugs.gentoo.org/835396 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* eclass/java-{utils-2,pkg-2,pkg-simple}: bump to eapi8Miroslav Šulc2021-12-021-2/+2
| | | | Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: Move EXPORT_FUNCTIONS below inheritUlrich Müller2021-09-031-2/+2
| | | | Signed-off-by: Ulrich Müller <ulm@gentoo.org>
* java-pkg-simple.eclass: added support for running only selected test classesMiroslav Šulc2021-07-041-19/+34
| | | | Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: improved code related to java 9+ modulesMiroslav Šulc2021-06-271-8/+24
| | | | | Bug: https://bugs.gentoo.org/796875 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: added support for module-info.java compilationMiroslav Šulc2021-06-241-4/+53
| | | | | | | for more info see https://bugs.gentoo.org/796875 Bug: https://bugs.gentoo.org/796875 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: fix @SUPPORTED_EAPIS eclassdocSam James2021-06-211-1/+1
| | | | Signed-off-by: Sam James <sam@gentoo.org>
* java-pkg-simple.eclass: [QA] add EAPI guardSam James2021-06-201-2/+13
| | | | | Signed-off-by: Sam James <sam@gentoo.org> Signed-off-by: David Seifert <soap@gentoo.org>
* eclass: normalise email format in @AUTHORSam James2021-03-311-2/+2
| | | | Signed-off-by: Sam James <sam@gentoo.org>
* java-pkg-simple.eclass: fixed copyrightMiroslav Šulc2020-09-051-1/+1
| | | | Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: Fix typos and commentsHenning Sudbrock2020-09-051-13/+12
| | | | | | | | | | | | | | | Mostly fixes typos (most of them in comments, only one in an actual variable, 'dependency'). Non-typos: * After the recent extensions of this eclass, it now supports resources - hence the change in the eclass description. * The usage description of java-pkg-simple_getclasspath mentions the optional parameter --runtime-only, which appears not to be provided by the function. Signed-off-by: Henning Sudbrock <github@hsudbrock.de> Closes: https://github.com/gentoo/gentoo/pull/17425 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass: Fix error message when copying resourcesHenning Sudbrock2020-09-011-1/+1
| | | | | | Signed-off-by: Henning Sudbrock <github@hsudbrock.de> Closes: https://github.com/gentoo/gentoo/pull/17363 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* java-pkg-simple.eclass and java-utils-2.eclass: features and enhancementsZhang Zongyu2020-08-301-29/+350
| | | | | | | | | | 1) support java resources 2) support java main class and launcher 3) enable java-pkg-simple_src_test() 4) support binary jars (both for resolve circular deps and for pkgdiff test) Signed-off-by: Zhang Zongyu <zzy2529420793@gmail.com> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
* Drop $Id$ per council decision in bug #611234.Robin H. Johnson2017-02-281-1/+0
| | | | Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
* java-pkg-simple.eclass: Implemented auto classpathWilliam L. Thomson Jr2016-10-171-0/+3
| | | | | | | | | Added call to java-pkg_gen-cp EANT_GENTOO_CLASSPATH in java-pkg-simple_src_compile. This has no effect unless CP_DEPEND is set in an ebuild. Closes: https://github.com/gentoo/gentoo/pull/2286 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
* java-pkg-simple.eclass: Rename JAVA_CLASSPATH_EXTRAJames Le Cuirot2015-11-011-2/+2
| | | | | …to JAVA_GENTOO_CLASSPATH_EXTRA to make this consistent with the EANT variables. Only one ebuild to fix.
* eclass: Fix varaible name in docs stringJustin Lecher2015-10-221-1/+1
| | | | Signed-off-by: Justin Lecher <jlec@gentoo.org>
* java-pkg-simple.eclass: Get rid of java-pkg-simple_verbose-cmd function and ↵Patrice Clement2015-10-201-24/+6
| | | | | | all its calls/references. Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
* java-{mvn-src,osgi,pkg-simple}.eclass: Rewrite documentation to make it ↵Patrice Clement2015-10-191-78/+50
| | | | | | compliant with the new style. Fixes bug 476946. Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
* fix broken headers in a few random filesMike Frysinger2015-10-051-6/+2
|
* proj/gentoo: Initial commitRobin H. Johnson2015-08-081-0/+209
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed