aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-09-01 14:27:10 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-09-08 20:15:58 +0200
commit1b19822a2df7ff969e3734973f131df9ed9d2ee3 (patch)
treecf0594943c705e59dfba531971b12070d8aa5bb2
parent62f7642a6152ddaafbe8b5fd9eb7b19e8d87c079 (diff)
downloadmeson-1b19822a2df7ff969e3734973f131df9ed9d2ee3.zip
meson-1b19822a2df7ff969e3734973f131df9ed9d2ee3.tar.gz
meson-1b19822a2df7ff969e3734973f131df9ed9d2ee3.tar.bz2
typing: Fix templates
-rw-r--r--mesonbuild/templates/cpptemplates.py4
-rw-r--r--mesonbuild/templates/cstemplates.py4
-rw-r--r--mesonbuild/templates/ctemplates.py4
-rw-r--r--mesonbuild/templates/cudatemplates.py4
-rw-r--r--mesonbuild/templates/dlangtemplates.py4
-rw-r--r--mesonbuild/templates/fortrantemplates.py4
-rw-r--r--mesonbuild/templates/javatemplates.py4
-rw-r--r--mesonbuild/templates/mesontemplates.py4
-rw-r--r--mesonbuild/templates/objcpptemplates.py4
-rw-r--r--mesonbuild/templates/objctemplates.py4
-rw-r--r--mesonbuild/templates/rusttemplates.py4
-rw-r--r--mesonbuild/templates/samplefactory.py4
-rw-r--r--mesonbuild/templates/sampleimpl.py4
13 files changed, 28 insertions, 24 deletions
diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py
index 834d955..2d28d3a 100644
--- a/mesonbuild/templates/cpptemplates.py
+++ b/mesonbuild/templates/cpptemplates.py
@@ -146,7 +146,7 @@ class CppProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -155,7 +155,7 @@ class CppProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
diff --git a/mesonbuild/templates/cstemplates.py b/mesonbuild/templates/cstemplates.py
index b9b376e..8524c97 100644
--- a/mesonbuild/templates/cstemplates.py
+++ b/mesonbuild/templates/cstemplates.py
@@ -95,7 +95,7 @@ class CSharpProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ def create_executable(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
@@ -107,7 +107,7 @@ class CSharpProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py
index 30acef3..440731c 100644
--- a/mesonbuild/templates/ctemplates.py
+++ b/mesonbuild/templates/ctemplates.py
@@ -129,7 +129,7 @@ class CProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -138,7 +138,7 @@ class CProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py
index 2321011..4fa9a2b 100644
--- a/mesonbuild/templates/cudatemplates.py
+++ b/mesonbuild/templates/cudatemplates.py
@@ -146,7 +146,7 @@ class CudaProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -155,7 +155,7 @@ class CudaProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
diff --git a/mesonbuild/templates/dlangtemplates.py b/mesonbuild/templates/dlangtemplates.py
index 84e6ab0..4aacda8 100644
--- a/mesonbuild/templates/dlangtemplates.py
+++ b/mesonbuild/templates/dlangtemplates.py
@@ -107,7 +107,7 @@ class DlangProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -116,7 +116,7 @@ class DlangProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py
index a4f3079..f4cae66 100644
--- a/mesonbuild/templates/fortrantemplates.py
+++ b/mesonbuild/templates/fortrantemplates.py
@@ -106,7 +106,7 @@ class FortranProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -115,7 +115,7 @@ class FortranProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/javatemplates.py b/mesonbuild/templates/javatemplates.py
index 211faed..9c64743 100644
--- a/mesonbuild/templates/javatemplates.py
+++ b/mesonbuild/templates/javatemplates.py
@@ -99,7 +99,7 @@ class JavaProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ def create_executable(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
@@ -111,7 +111,7 @@ class JavaProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
class_name = uppercase_token[0] + lowercase_token[1:]
diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py
index 6b341a2..68f9769 100644
--- a/mesonbuild/templates/mesontemplates.py
+++ b/mesonbuild/templates/mesontemplates.py
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import argparse
+
meson_executable_template = '''project('{project_name}', '{language}',
version : '{version}',
default_options : [{default_options}])
@@ -33,7 +35,7 @@ jar('{executable}',
'''
-def create_meson_build(options):
+def create_meson_build(options: argparse.Namespace) -> None:
if options.type != 'executable':
raise SystemExit('\nGenerating a meson.build file from existing sources is\n'
'supported only for project type "executable".\n'
diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py
index 84299a8..f4f4b51 100644
--- a/mesonbuild/templates/objcpptemplates.py
+++ b/mesonbuild/templates/objcpptemplates.py
@@ -129,7 +129,7 @@ class ObjCppProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -138,7 +138,7 @@ class ObjCppProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py
index 9ec4a5e..4243024 100644
--- a/mesonbuild/templates/objctemplates.py
+++ b/mesonbuild/templates/objctemplates.py
@@ -129,7 +129,7 @@ class ObjCProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -138,7 +138,7 @@ class ObjCProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/rusttemplates.py b/mesonbuild/templates/rusttemplates.py
index c4ff53d..6e99586 100644
--- a/mesonbuild/templates/rusttemplates.py
+++ b/mesonbuild/templates/rusttemplates.py
@@ -77,7 +77,7 @@ class RustProject(SampleImpl):
self.name = options.name
self.version = options.version
- def create_executable(self):
+ 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))
@@ -86,7 +86,7 @@ class RustProject(SampleImpl):
source_name=source_name,
version=self.version))
- def create_library(self):
+ def create_library(self) -> None:
lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
uppercase_token = lowercase_token.upper()
function_name = lowercase_token[0:3] + '_func'
diff --git a/mesonbuild/templates/samplefactory.py b/mesonbuild/templates/samplefactory.py
index 1da2bc1..1192e13 100644
--- a/mesonbuild/templates/samplefactory.py
+++ b/mesonbuild/templates/samplefactory.py
@@ -21,9 +21,11 @@ from mesonbuild.templates.objctemplates import ObjCProject
from mesonbuild.templates.cpptemplates import CppProject
from mesonbuild.templates.cstemplates import CSharpProject
from mesonbuild.templates.ctemplates import CProject
+from mesonbuild.templates.sampleimpl import SampleImpl
+import argparse
-def sameple_generator(options):
+def sameple_generator(options: argparse.Namespace) -> SampleImpl:
return {
'c': CProject,
'cpp': CppProject,
diff --git a/mesonbuild/templates/sampleimpl.py b/mesonbuild/templates/sampleimpl.py
index 20ed8ab..2d1498b 100644
--- a/mesonbuild/templates/sampleimpl.py
+++ b/mesonbuild/templates/sampleimpl.py
@@ -14,8 +14,8 @@
class SampleImpl:
- def create_executable(self):
+ def create_executable(self) -> None:
raise NotImplementedError('Sample implementation for "executable" not implemented!')
- def create_library(self):
+ def create_library(self) -> None:
raise NotImplementedError('Sample implementation for "library" not implemented!')