Skip to content

Implement feature contitionals #156

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

Merged
mizdebsk merged 1 commit into from
Feb 19, 2026
Merged

Implement feature contitionals #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,23 @@ vars_re=$(echo $vars | sed 's/ /\\|/g')
eval $(for _; do echo "$_"; done |
sed -n 's/^--\('"$vars_re"'\)=\(.*\)$/\1="\2"/;T;p')

conds="
ivy
gradle
generators
"

for _ in $conds; do
eval "with_$_=true"
done

conds_re=$(echo $conds | sed 's/ /\\|/g')
condvars_re=with_$(echo $conds | sed 's/ /\\|with_/g')

eval $(for _; do echo "$_"; done |
sed -n 's/^--without-\('"$conds_re"'\)$/with_\1=false/;T;p')


eval $(for _; do echo "$_"; done |
sed -n 's/^--jvm=\([^=]*\)=\(.*\)$/jvms="${jvms}\1=\2 "/;T;p')

Expand All @@ -90,5 +107,5 @@ test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"

eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)

set | sed -n 's/^\('"$vars_re"'\)=/&/;T;p' >config.status
set | sed -n 's/^\('"$vars_re\\|$condvars_re"'\)=/&/;T;p' >config.status
echo "jvms=\"${jvms}\"" >>config.status
49 changes: 25 additions & 24 deletions install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,41 +203,42 @@ inst_data java-utils/maven_depmap.py "${javadir}-utils"

inst_data target/macros.javapackages-compat "${rpmmacrodir}"

exec >files-generators
if $with_generators; then
exec >files-generators

dir "${rpmconfigdir}/fileattrs"
dir "${rpmconfigdir}/fileattrs"

inst_exec target/maven.prov "${rpmconfigdir}" maven.prov
inst_exec target/maven.req "${rpmconfigdir}" maven.req
inst_exec target/osgi.prov "${rpmconfigdir}" osgi.prov
inst_exec target/osgi.req "${rpmconfigdir}" osgi.req
inst_exec target/javadoc.req "${rpmconfigdir}" javadoc.req
inst_exec target/maven.prov "${rpmconfigdir}" maven.prov
inst_exec target/maven.req "${rpmconfigdir}" maven.req
inst_exec target/osgi.prov "${rpmconfigdir}" osgi.prov
inst_exec target/osgi.req "${rpmconfigdir}" osgi.req
inst_exec target/javadoc.req "${rpmconfigdir}" javadoc.req

inst_data target/maven.attr "${rpmconfigdir}/fileattrs" maven.attr
inst_data target/osgi.attr "${rpmconfigdir}/fileattrs" osgi.attr
inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs" javadoc.attr

inst_config etc/javapackages-config.json "${javaconfdir}"
inst_data target/maven.attr "${rpmconfigdir}/fileattrs" maven.attr
inst_data target/osgi.attr "${rpmconfigdir}/fileattrs" osgi.attr
inst_data target/javadoc.attr "${rpmconfigdir}/fileattrs" javadoc.attr

inst_config etc/javapackages-config.json "${javaconfdir}"
fi

exec >files-maven

# Nothing


exec >files-ivy

dir "${sysconfdir}/ivy"

inst_data configs/ivy-local-classpath "${sysconfdir}/ant.d"
inst_data configs/ivysettings.xml "${sysconfdir}/ivy"


exec >files-gradle
if $with_ivy; then
exec >files-ivy
dir "${sysconfdir}/ivy"
inst_data configs/ivy-local-classpath "${sysconfdir}/ant.d"
inst_data configs/ivysettings.xml "${sysconfdir}/ivy"
fi

inst_exec target/gradle-local "${bindir}"
inst_data gradle/init.gradle "${datadir}/gradle-local"
inst_data target/gradle_build.7 "${mandir}/man7"
if $with_gradle; then
exec >files-gradle
inst_exec target/gradle-local "${bindir}"
inst_data gradle/init.gradle "${datadir}/gradle-local"
inst_data target/gradle_build.7 "${mandir}/man7"
fi

exec >files-python
(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
Expand Down