| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Manuel Mommertz <manuel.mommertz@desy.de>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
|
|
| |
Reported by Arfrever.
Followup to 281d8924745172051af2946f2d8d2df42af1c6b0.
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
|
|
|
|
| |
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/835396
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
|
|
|
|
| |
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
| |
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
|
|
|
|
| |
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/796875
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
|
| |
for more info see https://bugs.gentoo.org/796875
Bug: https://bugs.gentoo.org/796875
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Signed-off-by: Henning Sudbrock <github@hsudbrock.de>
Closes: https://github.com/gentoo/gentoo/pull/17363
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
…to JAVA_GENTOO_CLASSPATH_EXTRA to make this consistent with the EANT
variables. Only one ebuild to fix.
|
|
|
|
| |
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
|
|
|
|
| |
all its calls/references.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
|
|
|
|
|
|
| |
compliant with the new style. Fixes bug 476946.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
|
| |
|
|
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
|