1 files changed, 43 insertions, 34 deletions
diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py
index 2d71573..84299a8 100644
--- a/mesonbuild/templates/objcpptemplates.py
+++ b/mesonbuild/templates/objcpptemplates.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from mesonbuild.templates.sampleimpl import SampleImpl
 import re
 
 
@@ -121,37 +122,45 @@ exe = executable('{exe_name}', '{source_name}',
 test('basic', exe)
 '''
 
-def create_exe_objcpp_sample(project_name, project_version):
-    lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower())
-    source_name = lowercase_token + '.mm'
-    open(source_name, 'w').write(hello_objcpp_template.format(project_name=project_name))
-    open('meson.build', 'w').write(hello_objcpp_meson_template.format(project_name=project_name,
-                                                                      exe_name=lowercase_token,
-                                                                      source_name=source_name,
-                                                                      version=project_version))
-
-def create_lib_objcpp_sample(project_name, version):
-    lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower())
-    uppercase_token = lowercase_token.upper()
-    function_name = lowercase_token[0:3] + '_func'
-    test_exe_name = lowercase_token + '_test'
-    lib_h_name = lowercase_token + '.h'
-    lib_objcpp_name = lowercase_token + '.mm'
-    test_objcpp_name = lowercase_token + '_test.mm'
-    kwargs = {'utoken': uppercase_token,
-              'ltoken': lowercase_token,
-              'header_dir': lowercase_token,
-              'function_name': function_name,
-              'header_file': lib_h_name,
-              'source_file': lib_objcpp_name,
-              'test_source_file': test_objcpp_name,
-              'test_exe_name': test_exe_name,
-              'project_name': project_name,
-              'lib_name': lowercase_token,
-              'test_name': lowercase_token,
-              'version': 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))
+
+class ObjCppProject(SampleImpl):
+    def __init__(self, options):
+        super().__init__()
+        self.name = options.name
+        self.version = options.version
+
+    def create_executable(self):
+        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))
+
+    def create_library(self):
+        lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
+        uppercase_token = lowercase_token.upper()
+        function_name = lowercase_token[0:3] + '_func'
+        test_exe_name = lowercase_token + '_test'
+        lib_h_name = lowercase_token + '.h'
+        lib_objcpp_name = lowercase_token + '.mm'
+        test_objcpp_name = lowercase_token + '_test.mm'
+        kwargs = {'utoken': uppercase_token,
+                  'ltoken': lowercase_token,
+                  'header_dir': lowercase_token,
+                  'function_name': function_name,
+                  'header_file': lib_h_name,
+                  'source_file': lib_objcpp_name,
+                  'test_source_file': test_objcpp_name,
+                  'test_exe_name': test_exe_name,
+                  'project_name': self.name,
+                  'lib_name': lowercase_token,
+                  '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))
+