aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/java.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/modules/java.py')
-rw-r--r--mesonbuild/modules/java.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/modules/java.py b/mesonbuild/modules/java.py
index 792d70b..6861ee0 100644
--- a/mesonbuild/modules/java.py
+++ b/mesonbuild/modules/java.py
@@ -75,13 +75,16 @@ class JavaModule(NewExtensionModule):
classes = T.cast('T.List[str]', kwargs.get('classes'))
package = kwargs.get('package')
+ if package:
+ sanitized_package = package.replace("-", "_").replace(".", "_")
+
headers: T.List[str] = []
for clazz in classes:
- underscore_clazz = clazz.replace(".", "_")
+ sanitized_clazz = clazz.replace(".", "_")
if package:
- headers.append(f'{package.replace(".", "_")}_{underscore_clazz}.h')
+ headers.append(f'{sanitized_package}_{sanitized_clazz}.h')
else:
- headers.append(f'{underscore_clazz}.h')
+ headers.append(f'{sanitized_clazz}.h')
javac = self.__get_java_compiler(state)