diff options
| author | Tristan Partin <tristan@partin.io> | 2023-02-07 17:20:39 -0600 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-02-19 02:55:58 +0530 |
| commit | d4923076fa49f180fee828c40de5947d1a1796f6 (patch) | |
| tree | 65db97744fe21cb2242173ff0b3582d84b390813 | |
| parent | 320be0b6b3ba59008a5886af48c6e0da2c19050d (diff) | |
| download | meson-d4923076fa49f180fee828c40de5947d1a1796f6.zip meson-d4923076fa49f180fee828c40de5947d1a1796f6.tar.gz meson-d4923076fa49f180fee828c40de5947d1a1796f6.tar.bz2 | |
Replace dashes in Java package names with underscores when generating native headers
This was causing a ninja issue where the native headers were always
being generated because io.github.hse-project.hse_Hse.h was being
expected, but io.github.hse_project.hse_Hse.h was actually generated.
| -rw-r--r-- | mesonbuild/modules/java.py | 9 |
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) |