From 71d17b44e45c68b8d0b5189a8ebe8412ab99c622 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 28 Nov 2018 15:15:54 +0100 Subject: Fixed list_target_files and list_targets --- mesonbuild/compilers/java.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 978562c..686d2e0 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -63,7 +63,7 @@ class JavaCompiler(Compiler): def get_std_exe_link_args(self): return [] - def get_include_args(self, path): + def get_include_args(self, path, is_system): return [] def get_pic_args(self): -- cgit v1.1 From c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 29 Nov 2018 12:56:52 +0100 Subject: Added unit test --- mesonbuild/compilers/java.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 686d2e0..978562c 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -63,7 +63,7 @@ class JavaCompiler(Compiler): def get_std_exe_link_args(self): return [] - def get_include_args(self, path, is_system): + def get_include_args(self, path): return [] def get_pic_args(self): -- cgit v1.1 From 97429279031d9b9f0ad9e2e66511c67d2dd0c6a0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sun, 30 Dec 2018 13:37:41 +0100 Subject: Absolute path generation refactoring --- mesonbuild/compilers/java.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 978562c..89d4c9c 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -81,6 +81,9 @@ class JavaCompiler(Compiler): def get_buildtype_args(self, buildtype): return java_buildtype_args[buildtype] + def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): + return parameter_list + def sanity_check(self, work_dir, environment): src = 'SanityCheck.java' obj = 'SanityCheck' -- cgit v1.1 From 9eca2e46a05870065e3cfa88ae42362d81aa3157 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sun, 30 Dec 2018 23:28:28 +0100 Subject: Added more compiler option support --- mesonbuild/compilers/java.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 89d4c9c..03cc1b0 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -82,6 +82,12 @@ class JavaCompiler(Compiler): return java_buildtype_args[buildtype] 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:])) + return parameter_list def sanity_check(self, work_dir, environment): -- cgit v1.1 From 681532452cf3863fe133108c54f99e9fe33c859c Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Mon, 31 Dec 2018 00:15:50 +0100 Subject: Handle java correct --- mesonbuild/compilers/java.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 03cc1b0..dbd1f3f 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -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 -- cgit v1.1 From 477b69b505c35ffe9fea758df74b1d821f47bf0b Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Mon, 31 Dec 2018 00:23:44 +0100 Subject: Use os.pathsep --- mesonbuild/compilers/java.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index dbd1f3f..1649511 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -84,7 +84,7 @@ class JavaCompiler(Compiler): def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): for idx, i in enumerate(parameter_list): if i in ['-cp', '-classpath', '-sourcepath'] and idx + 1 < len(parameter_list): - path_list = parameter_list[idx + 1].replace(';', ':').split(':') + path_list = parameter_list[idx + 1].split(os.pathsep) path_list = [os.path.normpath(os.path.join(build_dir, x)) for x in path_list] parameter_list[idx + 1] = ':'.join(path_list) -- cgit v1.1 From ca808a070273ad3dfa579a6f0849b33c561b459a Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Mon, 31 Dec 2018 00:28:25 +0100 Subject: More os.pathsep --- mesonbuild/compilers/java.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 1649511..03ee382 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -86,7 +86,7 @@ class JavaCompiler(Compiler): if i in ['-cp', '-classpath', '-sourcepath'] and idx + 1 < len(parameter_list): path_list = parameter_list[idx + 1].split(os.pathsep) path_list = [os.path.normpath(os.path.join(build_dir, x)) for x in path_list] - parameter_list[idx + 1] = ':'.join(path_list) + parameter_list[idx + 1] = os.pathsep.join(path_list) return parameter_list -- cgit v1.1