diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-22 22:59:16 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-29 11:28:08 +0200 |
| commit | 3e396b3782813d36d46195564cd0e111422bcaf5 (patch) | |
| tree | f315e990f71984745fcb8f22dac2f0e400fecadb /mesonbuild/templates | |
| parent | 28175bbee2c111cf41b80c97bbadd7dbabaa8990 (diff) | |
| download | meson-3e396b3782813d36d46195564cd0e111422bcaf5.tar.gz | |
fix: Always explicitly set encoding for text files (fixes #8263)
Diffstat (limited to 'mesonbuild/templates')
| -rw-r--r-- | mesonbuild/templates/cpptemplates.py | 19 | ||||
| -rw-r--r-- | mesonbuild/templates/cstemplates.py | 20 | ||||
| -rw-r--r-- | mesonbuild/templates/ctemplates.py | 19 | ||||
| -rw-r--r-- | mesonbuild/templates/cudatemplates.py | 19 | ||||
| -rw-r--r-- | mesonbuild/templates/dlangtemplates.py | 17 | ||||
| -rw-r--r-- | mesonbuild/templates/fortrantemplates.py | 17 | ||||
| -rw-r--r-- | mesonbuild/templates/javatemplates.py | 20 | ||||
| -rw-r--r-- | mesonbuild/templates/mesontemplates.py | 2 | ||||
| -rw-r--r-- | mesonbuild/templates/objcpptemplates.py | 19 | ||||
| -rw-r--r-- | mesonbuild/templates/objctemplates.py | 19 | ||||
| -rw-r--r-- | mesonbuild/templates/rusttemplates.py | 17 |
11 files changed, 100 insertions, 88 deletions
diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py index 2d28d3a17..61c273745 100644 --- a/mesonbuild/templates/cpptemplates.py +++ b/mesonbuild/templates/cpptemplates.py @@ -149,11 +149,12 @@ class CppProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.cpp' - open(source_name, 'w').write(hello_cpp_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_cpp_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_cpp_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_cpp_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -178,7 +179,7 @@ class CppProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_hpp_name, 'w').write(lib_hpp_template.format(**kwargs)) - open(lib_cpp_name, 'w').write(lib_cpp_template.format(**kwargs)) - open(test_cpp_name, 'w').write(lib_cpp_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_cpp_meson_template.format(**kwargs)) + open(lib_hpp_name, 'w', encoding='utf-8').write(lib_hpp_template.format(**kwargs)) + open(lib_cpp_name, 'w', encoding='utf-8').write(lib_cpp_template.format(**kwargs)) + open(test_cpp_name, 'w', encoding='utf-8').write(lib_cpp_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_cpp_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/cstemplates.py b/mesonbuild/templates/cstemplates.py index 8524c97ea..bad7984e9 100644 --- a/mesonbuild/templates/cstemplates.py +++ b/mesonbuild/templates/cstemplates.py @@ -100,12 +100,14 @@ class CSharpProject(SampleImpl): uppercase_token = lowercase_token.upper() class_name = uppercase_token[0] + lowercase_token[1:] source_name = uppercase_token[0] + lowercase_token[1:] + '.cs' - open(source_name, 'w').write(hello_cs_template.format(project_name=self.name, - class_name=class_name)) - open('meson.build', 'w').write(hello_cs_meson_template.format(project_name=self.name, - exe_name=self.name, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write( + hello_cs_template.format(project_name=self.name, + class_name=class_name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_cs_meson_template.format(project_name=self.name, + exe_name=self.name, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -127,6 +129,6 @@ class CSharpProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_cs_name, 'w').write(lib_cs_template.format(**kwargs)) - open(test_cs_name, 'w').write(lib_cs_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_cs_meson_template.format(**kwargs)) + open(lib_cs_name, 'w', encoding='utf-8').write(lib_cs_template.format(**kwargs)) + open(test_cs_name, 'w', encoding='utf-8').write(lib_cs_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_cs_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py index 440731cab..9b651bc8b 100644 --- a/mesonbuild/templates/ctemplates.py +++ b/mesonbuild/templates/ctemplates.py @@ -132,11 +132,12 @@ class CProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.c' - open(source_name, 'w').write(hello_c_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_c_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_c_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_c_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -159,7 +160,7 @@ class CProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_h_name, 'w').write(lib_h_template.format(**kwargs)) - open(lib_c_name, 'w').write(lib_c_template.format(**kwargs)) - open(test_c_name, 'w').write(lib_c_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_c_meson_template.format(**kwargs)) + open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs)) + open(lib_c_name, 'w', encoding='utf-8').write(lib_c_template.format(**kwargs)) + open(test_c_name, 'w', encoding='utf-8').write(lib_c_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_c_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py index 4fa9a2b4e..919db21be 100644 --- a/mesonbuild/templates/cudatemplates.py +++ b/mesonbuild/templates/cudatemplates.py @@ -149,11 +149,12 @@ class CudaProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.cu' - open(source_name, 'w').write(hello_cuda_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_cuda_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_cuda_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_cuda_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -178,7 +179,7 @@ class CudaProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_h_name, 'w').write(lib_h_template.format(**kwargs)) - open(lib_cuda_name, 'w').write(lib_cuda_template.format(**kwargs)) - open(test_cuda_name, 'w').write(lib_cuda_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_cuda_meson_template.format(**kwargs)) + open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs)) + open(lib_cuda_name, 'w', encoding='utf-8').write(lib_cuda_template.format(**kwargs)) + open(test_cuda_name, 'w', encoding='utf-8').write(lib_cuda_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_cuda_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/dlangtemplates.py b/mesonbuild/templates/dlangtemplates.py index 4aacda8c5..3d939d885 100644 --- a/mesonbuild/templates/dlangtemplates.py +++ b/mesonbuild/templates/dlangtemplates.py @@ -110,11 +110,12 @@ class DlangProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.d' - open(source_name, 'w').write(hello_d_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_d_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_d_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_d_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -137,6 +138,6 @@ class DlangProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_d_name, 'w').write(lib_d_template.format(**kwargs)) - open(test_d_name, 'w').write(lib_d_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_d_meson_template.format(**kwargs)) + open(lib_d_name, 'w', encoding='utf-8').write(lib_d_template.format(**kwargs)) + open(test_d_name, 'w', encoding='utf-8').write(lib_d_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_d_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py index f4cae66c9..8fc1bca35 100644 --- a/mesonbuild/templates/fortrantemplates.py +++ b/mesonbuild/templates/fortrantemplates.py @@ -109,11 +109,12 @@ class FortranProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.f90' - open(source_name, 'w').write(hello_fortran_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_fortran_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_fortran_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_fortran_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -134,6 +135,6 @@ class FortranProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_fortran_name, 'w').write(lib_fortran_template.format(**kwargs)) - open(test_fortran_name, 'w').write(lib_fortran_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_fortran_meson_template.format(**kwargs)) + open(lib_fortran_name, 'w', encoding='utf-8').write(lib_fortran_template.format(**kwargs)) + open(test_fortran_name, 'w', encoding='utf-8').write(lib_fortran_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_fortran_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/javatemplates.py b/mesonbuild/templates/javatemplates.py index 9c64743f1..e4329611d 100644 --- a/mesonbuild/templates/javatemplates.py +++ b/mesonbuild/templates/javatemplates.py @@ -104,12 +104,14 @@ class JavaProject(SampleImpl): uppercase_token = lowercase_token.upper() class_name = uppercase_token[0] + lowercase_token[1:] source_name = uppercase_token[0] + lowercase_token[1:] + '.java' - open(source_name, 'w').write(hello_java_template.format(project_name=self.name, - class_name=class_name)) - open('meson.build', 'w').write(hello_java_meson_template.format(project_name=self.name, - exe_name=class_name, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write( + hello_java_template.format(project_name=self.name, + class_name=class_name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_java_meson_template.format(project_name=self.name, + exe_name=class_name, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -129,6 +131,6 @@ class JavaProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_java_name, 'w').write(lib_java_template.format(**kwargs)) - open(test_java_name, 'w').write(lib_java_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_java_meson_template.format(**kwargs)) + open(lib_java_name, 'w', encoding='utf-8').write(lib_java_template.format(**kwargs)) + open(test_java_name, 'w', encoding='utf-8').write(lib_java_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_java_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py index 4c4d66f0b..a29ac6fdc 100644 --- a/mesonbuild/templates/mesontemplates.py +++ b/mesonbuild/templates/mesontemplates.py @@ -71,5 +71,5 @@ def create_meson_build(options: argparse.Namespace) -> None: sourcespec=sourcespec, depspec=depspec, default_options=formatted_default_options) - open('meson.build', 'w').write(content) + open('meson.build', 'w', encoding='utf-8').write(content) print('Generated meson.build file:\n\n' + content) diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py index f4f4b51ea..4f61d6c60 100644 --- a/mesonbuild/templates/objcpptemplates.py +++ b/mesonbuild/templates/objcpptemplates.py @@ -132,11 +132,12 @@ class ObjCppProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.mm' - open(source_name, 'w').write(hello_objcpp_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_objcpp_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_objcpp_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_objcpp_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -159,8 +160,8 @@ class ObjCppProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_h_name, 'w').write(lib_h_template.format(**kwargs)) - open(lib_objcpp_name, 'w').write(lib_objcpp_template.format(**kwargs)) - open(test_objcpp_name, 'w').write(lib_objcpp_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_objcpp_meson_template.format(**kwargs)) + open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs)) + open(lib_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_template.format(**kwargs)) + open(test_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_objcpp_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py index 4243024c2..dac638d14 100644 --- a/mesonbuild/templates/objctemplates.py +++ b/mesonbuild/templates/objctemplates.py @@ -132,11 +132,12 @@ class ObjCProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.m' - open(source_name, 'w').write(hello_objc_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_objc_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_objc_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_objc_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -159,7 +160,7 @@ class ObjCProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_h_name, 'w').write(lib_h_template.format(**kwargs)) - open(lib_objc_name, 'w').write(lib_objc_template.format(**kwargs)) - open(test_objc_name, 'w').write(lib_objc_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_objc_meson_template.format(**kwargs)) + open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs)) + open(lib_objc_name, 'w', encoding='utf-8').write(lib_objc_template.format(**kwargs)) + open(test_objc_name, 'w', encoding='utf-8').write(lib_objc_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_objc_meson_template.format(**kwargs)) diff --git a/mesonbuild/templates/rusttemplates.py b/mesonbuild/templates/rusttemplates.py index 6e9958694..95a937cca 100644 --- a/mesonbuild/templates/rusttemplates.py +++ b/mesonbuild/templates/rusttemplates.py @@ -80,11 +80,12 @@ class RustProject(SampleImpl): def create_executable(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) source_name = lowercase_token + '.rs' - open(source_name, 'w').write(hello_rust_template.format(project_name=self.name)) - open('meson.build', 'w').write(hello_rust_meson_template.format(project_name=self.name, - exe_name=lowercase_token, - source_name=source_name, - version=self.version)) + open(source_name, 'w', encoding='utf-8').write(hello_rust_template.format(project_name=self.name)) + open('meson.build', 'w', encoding='utf-8').write( + hello_rust_meson_template.format(project_name=self.name, + exe_name=lowercase_token, + source_name=source_name, + version=self.version)) def create_library(self) -> None: lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower()) @@ -107,6 +108,6 @@ class RustProject(SampleImpl): 'test_name': lowercase_token, 'version': self.version, } - open(lib_rs_name, 'w').write(lib_rust_template.format(**kwargs)) - open(test_rs_name, 'w').write(lib_rust_test_template.format(**kwargs)) - open('meson.build', 'w').write(lib_rust_meson_template.format(**kwargs)) + open(lib_rs_name, 'w', encoding='utf-8').write(lib_rust_template.format(**kwargs)) + open(test_rs_name, 'w', encoding='utf-8').write(lib_rust_test_template.format(**kwargs)) + open('meson.build', 'w', encoding='utf-8').write(lib_rust_meson_template.format(**kwargs)) |
