Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

java-utils-2.eclass: default to default_src_prepare for future EAPI #29626

Closed
wants to merge 2 commits into from
Closed

java-utils-2.eclass: default to default_src_prepare for future EAPI #29626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf8558
java-utils-2.eclass: default to default_src_prepare for future EAPI
vaukai Feb 17, 2023
42edd6e
java-utils-2.eclass: use find with -path instead of -wholename
vaukai Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions eclass/java-utils-2.eclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,10 @@ etestng() {
# src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare!
java-utils-2_src_prepare() {
eapply_user
case ${EAPI:-0} in
[678]) eapply_user ;;
*) default_src_prepare ;;
esac

# Check for files in JAVA_RM_FILES array.
if [[ ${JAVA_RM_FILES[@]} ]]; then
Expand Down Expand Up @@ -2944,7 +2947,7 @@ is-java-strict() {
java-pkg_clean() {
NO_DELETE=()
for keep in ${JAVA_PKG_NO_CLEAN[@]}; do
NO_DELETE+=( '!' '-wholename' ${keep} )
NO_DELETE+=( '!' '-path' ${keep} )
done
find "${@}" '(' -name '*.class' -o -name '*.jar' ${NO_DELETE[@]} ')' -type f -delete -print || die
}
Expand Down