Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle java correct

This commit is contained in:
Daniel Mensinger 2018-12-31 00:15:50 +01:00
parent b97046ea0f
commit 681532452c
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/compilers/java.py
View File

@ -83,10 +83,10 @@ class JavaCompiler(Compiler):
def compute_parameters_with_absolute_paths(self, parameter_list, build_dir):
for idx, i in enumerate(parameter_list):
if i[:4] == '-cp:' or i[:4] == '-cp;':
parameter_list[idx] = i[:4] + os.path.normpath(os.path.join(build_dir, i[4:]))
if i[:11] == '-classpath:' or i[:11] == '-classpath;':
parameter_list[idx] = i[:11] + os.path.normpath(os.path.join(build_dir, i[11:]))
if i in ['-cp', '-classpath', '-sourcepath'] and idx + 1 < len(parameter_list):
path_list = parameter_list[idx + 1].replace(';', ':').split(':')
path_list = [os.path.normpath(os.path.join(build_dir, x)) for x in path_list]
parameter_list[idx + 1] = ':'.join(path_list)
return parameter_list