billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Java support.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-04 16:10:38 +00:00
parent 8f39cc839b
commit da2605ab25
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
5 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ognibuild/resolver/apt.py
View file

@ -50,6 +50,7 @@ from ..requirements import (
MavenArtifactRequirement,
GnomeCommonRequirement,
JDKFileRequirement,
JDKRequirement,
PerlModuleRequirement,
PerlFileRequirement,
AutoconfMacroRequirement,
@ -444,6 +445,10 @@ def resolve_jdk_file_req(apt_mgr, req):
return None
def resolve_jdk_req(apt_mgr, req):
return AptRequirement.simple('default-jdk')
def resolve_perl_module_req(apt_mgr, req):
DEFAULT_PERL_PATHS = ["/usr/share/perl5"]
@ -547,6 +552,7 @@ APT_REQUIREMENT_RESOLVERS = [
(MavenArtifactRequirement, resolve_maven_artifact_req),
(GnomeCommonRequirement, resolve_gnome_common_req),
(JDKFileRequirement, resolve_jdk_file_req),
(JDKRequirement, resolve_jdk_req),
(PerlModuleRequirement, resolve_perl_module_req),
(PerlFileRequirement, resolve_perl_file_req),
(AutoconfMacroRequirement, resolve_autoconf_macro_req),