diff --git a/ognibuild/buildlog.py b/ognibuild/buildlog.py index 4b4857e..7d7d4c3 100644 --- a/ognibuild/buildlog.py +++ b/ognibuild/buildlog.py @@ -35,6 +35,7 @@ from buildlog_consultant.common import ( MissingXmlEntity, MissingJDKFile, MissingJDK, + MissingJRE, MissingNodeModule, MissingPhpClass, MissingRubyGem, @@ -133,6 +134,8 @@ def problem_to_upstream_requirement(problem): # noqa: C901 return JDKFileRequirement(problem.jdk_path, problem.filename) elif isinstance(problem, MissingJDK): return JDKRequirement() + elif isinstance(problem, MissingJRE): + return JRERequirement() elif isinstance(problem, MissingGnomeCommonDependency): if problem.package == "glib-gettext": return BinaryRequirement("glib-gettextize") diff --git a/ognibuild/requirements.py b/ognibuild/requirements.py index fc19f79..8b6a0b1 100644 --- a/ognibuild/requirements.py +++ b/ognibuild/requirements.py @@ -375,6 +375,12 @@ class JDKRequirement(Requirement): super(JDKRequirement, self).__init__("jdk") +class JRERequirement(Requirement): + + def __init__(self): + super(JRERequirement, self).__init__("jre") + + class PerlFileRequirement(Requirement): filename: str diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index 8cd4f25..cdfa028 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -52,6 +52,7 @@ from ..requirements import ( GnomeCommonRequirement, JDKFileRequirement, JDKRequirement, + JRERequirement, PerlModuleRequirement, PerlFileRequirement, AutoconfMacroRequirement, @@ -465,6 +466,10 @@ def resolve_jdk_req(apt_mgr, req): return AptRequirement.simple('default-jdk') +def resolve_jre_req(apt_mgr, req): + return AptRequirement.simple('default-jre') + + def resolve_perl_module_req(apt_mgr, req): DEFAULT_PERL_PATHS = ["/usr/share/perl5"] @@ -575,6 +580,7 @@ APT_REQUIREMENT_RESOLVERS = [ (GnomeCommonRequirement, resolve_gnome_common_req), (JDKFileRequirement, resolve_jdk_file_req), (JDKRequirement, resolve_jdk_req), + (JRERequirement, resolve_jre_req), (PerlModuleRequirement, resolve_perl_module_req), (PerlFileRequirement, resolve_perl_file_req), (AutoconfMacroRequirement, resolve_autoconf_macro_req),