Basic work on extracting build target types from the interpreter.

1 files changed, 17 insertions, 235 deletions

diff --git a/interpreter.py b/interpreter.py
index 917caf0..fc12420 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -18,7 +18,8 @@ import environment
 import coredata
 import dependencies
 import mlog
-import os, sys, platform, copy, subprocess, shutil
+import build
+import os, sys, platform, subprocess, shutil
 
 class InterpreterException(coredata.MesonException):
     pass
@@ -26,9 +27,6 @@ class InterpreterException(coredata.MesonException):
 class InvalidCode(InterpreterException):
     pass
 
-class InvalidArguments(InterpreterException):
-    pass
-
 class InterpreterObject():
     def __init__(self):
         self.methods = {}
@@ -409,237 +407,21 @@ class Man(InterpreterObject):
     def get_sources(self):
         return self.sources
 
-class BuildTarget(InterpreterObject):
-    def __init__(self, name, subdir, is_cross, sources, kwargs):
-        InterpreterObject.__init__(self)
-        self.name = name
-        self.subdir = subdir
-        self.is_cross = is_cross
-        self.sources = []
-        self.external_deps = []
-        self.include_dirs = []
-        self.link_targets = []
-        self.filename = 'no_name'
-        self.need_install = False
-        self.pch = {}
-        self.extra_args = {}
-        self.generated = []
-        self.process_sourcelist(sources)
-        self.process_kwargs(kwargs)
-        if len(self.sources) == 0 and len(self.generated) == 0:
-            raise InvalidArguments('Build target %s has no sources.' % name)
-    
-    def process_sourcelist(self, sources):
-        if not isinstance(sources, list):
-            sources = [sources]
-        for s in sources:
-            if isinstance(s, str):
-                self.sources.append(s)
-            elif isinstance(s, GeneratedList):
-                self.generated.append(s)
-            else:
-                raise InvalidArguments('Bad source in target %s.' % self.name)
-
-    def get_original_kwargs(self):
-        return self.kwargs
-
-    def process_kwargs(self, kwargs):
-        self.kwargs = copy.copy(kwargs)
-        kwargs.get('modules', [])
-        self.need_install = kwargs.get('install', self.need_install)
-        llist = kwargs.get('link_with', [])
-        if not isinstance(llist, list):
-            llist = [llist]
-        for linktarget in llist:
-            self.link(linktarget)
-        c_pchlist = kwargs.get('c_pch', [])
-        if not isinstance(c_pchlist, list):
-            c_pchlist = [c_pchlist]
-        self.add_pch('c', c_pchlist)
-        cpp_pchlist = kwargs.get('cpp_pch', [])
-        if not isinstance(cpp_pchlist, list):
-            cpp_pchlist = [cpp_pchlist]
-        self.add_pch('cpp', cpp_pchlist)
-        clist = kwargs.get('c_args', [])
-        if not isinstance(clist, list):
-            clist = [clist]
-        self.add_compiler_args('c', clist)
-        cpplist = kwargs.get('cpp_args', [])
-        if not isinstance(cpplist, list):
-            cpplist = [cpplist]
-        self.add_compiler_args('cpp', cpplist)
-        if 'version' in kwargs:
-            self.set_version(kwargs['version'])
-        if 'soversion' in kwargs:
-            self.set_soversion(kwargs['soversion'])
-        inclist = kwargs.get('include_dirs', [])
-        if not isinstance(inclist, list):
-            inclist = [inclist]
-        self.add_include_dirs(inclist)
-        deplist = kwargs.get('deps', [])
-        if not isinstance(deplist, list):
-            deplist = [deplist]
-        self.add_external_deps(deplist)
-
-    def get_subdir(self):
-        return self.subdir
-
-    def get_filename(self):
-        return self.filename
-
-    def get_extra_args(self, language):
-        return self.extra_args.get(language, [])
-
-    def get_dependencies(self):
-        return self.link_targets
-
-    def get_basename(self):
-        return self.name
-
-    def get_source_subdir(self):
-        return self.subdir
+class BuildTargetHolder(InterpreterObject):
+    def __init__(self, targetttype, name, subdir, is_cross, sources, environment, kwargs):
+        self.target = targetttype(name, subdir, is_cross, sources, environment, kwargs)
 
-    def get_sources(self):
-        return self.sources
-
-    def get_generated_sources(self):
-        return self.generated
-
-    def should_install(self):
-        return self.need_install
-
-    def has_pch(self):
-        return len(self.pch) > 0
-
-    def get_pch(self, language):
-        try:
-            return self.pch[language]
-        except KeyError:
-            return[]
-
-    def get_include_dirs(self):
-        return self.include_dirs
-
-    def add_external_deps(self, deps):
-        for dep in deps:
-            if not isinstance(dep, dependencies.Dependency) and\
-               not isinstance(dep, ExternalLibraryHolder):
-                raise InvalidArguments('Argument is not an external dependency')
-            self.external_deps.append(dep)
-            if isinstance(dep, dependencies.Dependency):
-                self.process_sourcelist(dep.get_sources())
-
-    def get_external_deps(self):
-        return self.external_deps
-
-    def add_dep(self, args):
-        [self.add_external_dep(dep) for dep in args]
-
-    def link(self, target):
-        if not isinstance(target, StaticLibrary) and \
-        not isinstance(target, SharedLibrary):
-            raise InvalidArguments('Link target is not library.')
-        self.link_targets.append(target)
-
-    def set_generated(self, genlist):
-        for g in genlist:
-            if not(isinstance(g, GeneratedList)):
-                raise InvalidArguments('Generated source argument is not the output of a generator.')
-            self.generated.append(g)
-
-    def add_pch(self, language, pchlist):
-        if len(pchlist) == 0:
-            return
-        if len(pchlist) == 2:
-            if environment.is_header(pchlist[0]):
-                if not environment.is_source(pchlist[1]):
-                    raise InterpreterException('PCH definition must contain one header and at most one source.')
-            elif environment.is_source(pchlist[0]):
-                if not environment.is_header(pchlist[1]):
-                    raise InterpreterException('PCH definition must contain one header and at most one source.')
-                pchlist = [pchlist[1], pchlist[0]]
-            else:
-                raise InterpreterException('PCH argument %s is of unknown type.' % pchlist[0])
-        elif len(pchlist) > 2:
-            raise InterpreterException('PCH definition may have a maximum of 2 files.')
-        self.pch[language] = pchlist
-
-    def add_include_dirs(self, args):
-        for a in args:
-            if not isinstance(a, IncludeDirs):
-                raise InvalidArguments('Include directory to be added is not an include directory object.')
-        self.include_dirs += args
-
-    def add_compiler_args(self, language, flags):
-        for a in flags:
-            if not isinstance(a, str):
-                raise InvalidArguments('A non-string passed to compiler args.')
-        if language in self.extra_args:
-            self.extra_args[language] += flags
-        else:
-            self.extra_args[language] = flags
-
-    def get_aliaslist(self):
-        return []
-
-class Executable(BuildTarget):
+class ExecutableHolder(BuildTargetHolder):
     def __init__(self, name, subdir, is_cross, sources, environment, kwargs):
-        BuildTarget.__init__(self, name, subdir, is_cross, sources, kwargs)
-        suffix = environment.get_exe_suffix()
-        if suffix != '':
-            self.filename = self.name + '.' + suffix
-        else:
-            self.filename = self.name
+        super().__init__(build.Executable, name, subdir, is_cross, sources, environment, kwargs)
 
-class StaticLibrary(BuildTarget):
+class StaticLibraryHolder(BuildTargetHolder):
     def __init__(self, name, subdir, is_cross, sources, environment, kwargs):
-        BuildTarget.__init__(self, name, subdir, is_cross, sources, kwargs)
-        prefix = environment.get_static_lib_prefix()
-        suffix = environment.get_static_lib_suffix()
-        self.filename = prefix + self.name + '.' + suffix
+        super().__init__(build.StaticLibrary, name, subdir, is_cross, sources, environment, kwargs)
 
-class SharedLibrary(BuildTarget):
+class SharedLibraryHolder(BuildTargetHolder):
     def __init__(self, name, subdir, is_cross, sources, environment, kwargs):
-        self.version = None
-        self.soversion = None
-        BuildTarget.__init__(self, name, subdir, is_cross, sources, kwargs)
-        self.prefix = environment.get_shared_lib_prefix()
-        self.suffix = environment.get_shared_lib_suffix()
-
-    def get_shbase(self):
-        return self.prefix + self.name + '.' + self.suffix
-
-    def get_filename(self):
-        fname = self.get_shbase()
-        if self.version is None:
-            return fname
-        else:
-            return fname + '.' + self.version
-
-    def set_version(self, version):
-        if isinstance(version, nodes.StringStatement):
-            version = version.get_value()
-        if not isinstance(version, str):
-            print(version)
-            raise InvalidArguments('Shared library version is not a string.')
-        self.version = version
-
-    def set_soversion(self, version):
-        if isinstance(version, nodes.StringStatement) or isinstance(version, nodes.IntStatement):
-            version = version.get_value()
-        if isinstance(version, int):
-            version = str(version)
-        if not isinstance(version, str):
-            raise InvalidArguments('Shared library soversion is not a string or integer.')
-        self.soversion = version
-
-    def get_aliaslist(self):
-        aliases = []
-        if self.soversion is not None:
-            aliases.append(self.get_shbase() + '.' + self.soversion)
-        if self.version is not None:
-            aliases.append(self.get_shbase())
-        return aliases
+        super().__init__(build.SharedLibrary, name, subdir, is_cross, sources, environment, kwargs)
 
 class Test(InterpreterObject):
     def __init__(self, name, exe, is_parallel):
@@ -1107,13 +889,13 @@ class Interpreter():
         return dep
 
     def func_executable(self, node, args, kwargs):
-        return self.build_target(node, args, kwargs, Executable)
+        return self.build_target(node, args, kwargs, ExecutableHolder)
 
     def func_static_lib(self, node, args, kwargs):
-        return self.build_target(node, args, kwargs, StaticLibrary)
+        return self.build_target(node, args, kwargs, StaticLibraryHolder)
 
     def func_shared_lib(self, node, args, kwargs):
-        return self.build_target(node, args, kwargs, SharedLibrary)
+        return self.build_target(node, args, kwargs, SharedLibraryHolder)
 
     def func_generator(self, node, args, kwargs):
         gen = Generator(args, kwargs)
@@ -1121,11 +903,11 @@ class Interpreter():
         return gen
 
     def func_test(self, node, args, kwargs):
-        self.validate_arguments(args, 2, [str, Executable])
+        self.validate_arguments(args, 2, [str, ExecutableHolder])
         par = kwargs.get('is_parallel', True)
         if not isinstance(par, bool):
             raise InterpreterException('Keyword argument is_parallel must be a boolean.')
-        t = Test(args[0], args[1], par)
+        t = Test(args[0], args[1].target, par)
         self.build.tests.append(t)
         mlog.debug('Adding test "', mlog.bold(args[0]), '".', sep='')
 
@@ -1265,7 +1047,7 @@ class Interpreter():
             raise InvalidCode('Tried to create target "%s", but a target of that name already exists.' % name)
         self.check_sources_exist(os.path.join(self.environment.source_dir, self.subdir), sources)
         l = targetclass(name, self.subdir, is_cross, sources, self.environment, kwargs)
-        self.build.targets[name] = l
+        self.build.targets[name] = l.target
         if self.environment.is_cross_build() and l.is_cross:
             txt = ' cross build '
         else: