compilers: Move clike into a mixins directory

The compilers module is rather large and confusing, with spaghetti
dependencies going every which way. I'm planning to start breaking out
the internal representations into a mixins submodule, for things that
shouldn't be required outside of the compilers module itself.
pull/5661/head
Dylan Baker 6 years ago
parent cd12a6fc39
commit d483da46a9
  1. 2
      mesonbuild/compilers/c.py
  2. 2
      mesonbuild/compilers/cpp.py
  3. 2
      mesonbuild/compilers/fortran.py
  4. 0
      mesonbuild/compilers/mixins/__init__.py
  5. 8
      mesonbuild/compilers/mixins/clike.py
  6. 2
      mesonbuild/compilers/objc.py
  7. 2
      mesonbuild/compilers/objcpp.py
  8. 1
      setup.py

@ -18,7 +18,7 @@ import typing
from .. import coredata
from ..mesonlib import MachineChoice, MesonException, mlog, version_compare
from .c_function_attributes import C_FUNC_ATTRIBUTES
from .clike import CLikeCompiler
from .mixins.clike import CLikeCompiler
from .compilers import (
gnu_winlibs,

@ -37,7 +37,7 @@ from .compilers import (
VisualStudioLikeCompiler,
)
from .c_function_attributes import CXX_FUNC_ATTRIBUTES, C_FUNC_ATTRIBUTES
from .clike import CLikeCompiler
from .mixins.clike import CLikeCompiler
def non_msvc_eh_options(eh, args):
if eh == 'none':

@ -30,7 +30,7 @@ from .compilers import (
PGICompiler,
IntelVisualStudioLikeCompiler,
)
from .clike import CLikeCompiler
from .mixins.clike import CLikeCompiler
from .. import mlog
from mesonbuild.mesonlib import (

@ -29,10 +29,10 @@ import subprocess
import typing
from pathlib import Path
from .. import mesonlib
from ..mesonlib import LibType
from .. import mlog
from . import compilers
from ... import mesonlib
from ...mesonlib import LibType
from ... import mlog
from .. import compilers
class CLikeCompiler:

@ -17,7 +17,7 @@ import typing
from ..mesonlib import EnvironmentException, MachineChoice
from .clike import CLikeCompiler
from .mixins.clike import CLikeCompiler
from .compilers import Compiler, ClangCompiler, GnuCompiler
class ObjCCompiler(CLikeCompiler, Compiler):

@ -17,7 +17,7 @@ import typing
from ..mesonlib import EnvironmentException, MachineChoice
from .clike import CLikeCompiler
from .mixins.clike import CLikeCompiler
from .compilers import Compiler, ClangCompiler, GnuCompiler
class ObjCPPCompiler(CLikeCompiler, Compiler):

@ -31,6 +31,7 @@ packages = ['mesonbuild',
'mesonbuild.backend',
'mesonbuild.cmake',
'mesonbuild.compilers',
'mesonbuild.compilers.mixins',
'mesonbuild.dependencies',
'mesonbuild.modules',
'mesonbuild.scripts',

Loading…
Cancel
Save