kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-01 00:30:13 +02:00
Code Activity

Merge branch 'support-java-20' into 'master'

Browse Source 
support Java 20, which is already in Debian/unstable, closes #1070

Closes #1070

See merge request fdroid/fdroidserver!1304
This commit is contained in:
Hans-Christoph Steiner 2023-02-17 15:48:51 +00:00
commit e03d71f6c3
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fdroidserver/common.py
View File

@ -197,18 +197,18 @@ def _add_java_paths_to_config(pathlist, thisconfig):
j = os.path.basename(d) j = os.path.basename(d)
# the last one found will be the canonical one, so order appropriately # the last one found will be the canonical one, so order appropriately
for regex in [ for regex in [
r'^1\.([16-9][0-9]?)\.0\.jdk$', # OSX r'^1\.([126-9][0-9]?)\.0\.jdk$', # OSX
r'^jdk1\.([16-9][0-9]?)\.0_[0-9]+.jdk$', # OSX and Oracle tarball r'^jdk1\.([126-9][0-9]?)\.0_[0-9]+.jdk$', # OSX and Oracle tarball
r'^jdk1\.([16-9][0-9]?)\.0_[0-9]+$', # Oracle Windows r'^jdk1\.([126-9][0-9]?)\.0_[0-9]+$', # Oracle Windows
r'^jdk([16-9][0-9]?)-openjdk$', # Arch r'^jdk([126-9][0-9]?)-openjdk$', # Arch
r'^java-([16-9][0-9]?)-openjdk$', # Arch r'^java-([126-9][0-9]?)-openjdk$', # Arch
r'^java-([16-9][0-9]?)-jdk$', # Arch (oracle) r'^java-([126-9][0-9]?)-jdk$', # Arch (oracle)
r'^java-1\.([16-9][0-9]?)\.0-.*$', # RedHat r'^java-1\.([126-9][0-9]?)\.0-.*$', # RedHat
r'^java-([16-9][0-9]?)-oracle$', # Debian WebUpd8 r'^java-([126-9][0-9]?)-oracle$', # Debian WebUpd8
r'^jdk-([16-9][0-9]?)-oracle-.*$', # Debian make-jpkg r'^jdk-([126-9][0-9]?)-oracle-.*$', # Debian make-jpkg
r'^java-([16-9][0-9]?)-openjdk-[^c][^o][^m].*$', # Debian r'^java-([126-9][0-9]?)-openjdk-[^c][^o][^m].*$', # Debian
r'^oracle-jdk-bin-1\.([17-9][0-9]?).*$', # Gentoo (oracle) r'^oracle-jdk-bin-1\.([126-9][0-9]?).*$', # Gentoo (oracle)
r'^icedtea-bin-([17-9][0-9]?).*$', # Gentoo (openjdk) r'^icedtea-bin-([126-9][0-9]?).*$', # Gentoo (openjdk)
]: ]:
m = re.match(regex, j) m = re.match(regex, j)
if not m: if not m:
@ -256,19 +256,20 @@ def fill_config_defaults(thisconfig):
if thisconfig['java_paths'] is None: if thisconfig['java_paths'] is None:
thisconfig['java_paths'] = dict() thisconfig['java_paths'] = dict()
pathlist = [] pathlist = []
pathlist += glob.glob('/usr/lib/jvm/j*[16-9]*') pathlist += glob.glob('/usr/lib/jvm/j*[126-9]*')
pathlist += glob.glob('/usr/java/jdk1.[16-9]*') pathlist += glob.glob('/usr/java/jdk1.[126-9]*')
pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[16-9][0-9]?.0.jdk') pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[126-9][0-9]?.0.jdk')
pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[0-9]*') pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[0-9]*')
pathlist += glob.glob('/opt/oracle-jdk-*1.[0-9]*') pathlist += glob.glob('/opt/oracle-jdk-*1.[0-9]*')
pathlist += glob.glob('/opt/icedtea-*[0-9]*') pathlist += glob.glob('/opt/icedtea-*[0-9]*')
if os.getenv('JAVA_HOME') is not None: if os.getenv('JAVA_HOME') is not None:
pathlist.append(os.getenv('JAVA_HOME')) pathlist.append(os.getenv('JAVA_HOME'))
if os.getenv('PROGRAMFILES') is not None: if os.getenv('PROGRAMFILES') is not None:
pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[16-9][0-9]?.*')) pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[126-9][0-9]?.*'))
_add_java_paths_to_config(pathlist, thisconfig) _add_java_paths_to_config(pathlist, thisconfig)
for java_version in ('14', '13', '12', '11', '10', '9', '8', '7'): for java_version in range(29, 6, -1):
java_version = str(java_version)
if java_version not in thisconfig['java_paths']: if java_version not in thisconfig['java_paths']:
continue continue
java_home = thisconfig['java_paths'][java_version] java_home = thisconfig['java_paths'][java_version]

18
tests/common.TestCase
View File

@ -2262,6 +2262,24 @@ class CommonTest(unittest.TestCase):
{'r10e': r10e, 'r17c': ndk_bundle, 'r21e': r21e}, config['ndk_paths'] {'r10e': r10e, 'r17c': ndk_bundle, 'r21e': r21e}, config['ndk_paths']
) )
@unittest.skipIf(not os.path.isdir('/usr/lib/jvm/default-java'), 'uses Debian path')
def test_fill_config_defaults_java(self):
"""Test the auto-detection of Java installed in standard paths"""
config = {'sdk_path': self.tmpdir}
fdroidserver.common.fill_config_defaults(config)
java_paths = []
# use presence of javac to make sure its JDK not just JRE
for f in glob.glob('/usr/lib/jvm/java-*-openjdk-amd64/bin/javac'):
jdk = os.path.dirname(os.path.dirname(f))
if not os.path.islink(jdk):
java_paths.append(jdk)
self.assertEqual(
len(java_paths),
len(config['java_paths'])
)
for f in config['java_paths'].values():
self.assertTrue(f in java_paths)
def test_vcs_git_latesttags(self): def test_vcs_git_latesttags(self):
tags = [ tags = [
"1.1.1", "1.1.1",