split program related classes and functions out of dependencies

Dependencies is already a large and complicated package without adding
programs to the list. This also allows us to untangle a bit of spaghetti
that we have.

9 files changed, 14 insertions, 9 deletions

diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 759b9694b..15b0e29ce 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -40,10 +40,11 @@ from .compilers import (
 
 if T.TYPE_CHECKING:
     from ..coredata import KeyedOptionDictType
-    from ..dependencies import Dependency, ExternalProgram
+    from ..dependencies import Dependency
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
+    from ..programs import ExternalProgram
 
     CompilerMixinBase = Compiler
 else:
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index d0e3fd2a1..c267c0fed 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -42,10 +42,11 @@ from .mixins.emscripten import EmscriptenMixin
 
 if T.TYPE_CHECKING:
     from ..coredata import KeyedOptionDictType
-    from ..dependencies import Dependency, ExternalProgram
+    from ..dependencies import Dependency
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
+    from ..programs import ExternalProgram
     from .mixins.clike import CLikeCompiler as CompilerMixinBase
 else:
     CompilerMixinBase = object
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index b7dc0f59c..ef6375ab0 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -29,10 +29,11 @@ from .compilers import (Compiler, cuda_buildtype_args, cuda_optimization_args,
 if T.TYPE_CHECKING:
     from ..build import BuildTarget
     from ..coredata import KeyedOptionDictType
-    from ..dependencies import Dependency, ExternalProgram
+    from ..dependencies import Dependency
     from ..environment import Environment  # noqa: F401
     from ..envconfig import MachineInfo
     from ..linkers import DynamicLinker
+    from ..programs import ExternalProgram
 
 
 class _Phase(enum.Enum):
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 837ee9a65..78d0f6262 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -34,7 +34,7 @@ from .mixins.gnu import GnuCompiler
 
 if T.TYPE_CHECKING:
     from .compilers import Compiler as CompilerMixinBase
-    from ..dependencies import Dependency, ExternalProgram
+    from ..programs import ExternalProgram
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index d65d5853c..0cff60a64 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -37,10 +37,11 @@ from mesonbuild.mesonlib import (
 
 if T.TYPE_CHECKING:
     from ..coredata import KeyedOptionDictType
-    from ..dependencies import Dependency, ExternalProgram
+    from ..dependencies import Dependency
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
+    from ..programs import ExternalProgram
 
 
 class FortranCompiler(CLikeCompiler, Compiler):
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 787c2c124..3932244f2 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -41,9 +41,10 @@ from ..compilers import CompileCheckMode
 from .visualstudio import VisualStudioLikeCompiler
 
 if T.TYPE_CHECKING:
-    from ...dependencies import Dependency, ExternalProgram
+    from ...dependencies import Dependency
     from ...environment import Environment
     from ...compilers.compilers import Compiler
+    from ...programs import ExternalProgram
 else:
     # This is a bit clever, for mypy we pretend that these mixins descend from
     # Compiler, so we get all of the methods and attributes defined for us, but
diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
index e47bf2fea..ce9cf2dbf 100644
--- a/mesonbuild/compilers/objc.py
+++ b/mesonbuild/compilers/objc.py
@@ -23,7 +23,7 @@ from .mixins.gnu import GnuCompiler
 from .mixins.clang import ClangCompiler
 
 if T.TYPE_CHECKING:
-    from ..dependencies import ExternalProgram
+    from ..programs import ExternalProgram
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
index c0f93d70d..585a45e86 100644
--- a/mesonbuild/compilers/objcpp.py
+++ b/mesonbuild/compilers/objcpp.py
@@ -23,7 +23,7 @@ from .mixins.gnu import GnuCompiler
 from .mixins.clang import ClangCompiler
 
 if T.TYPE_CHECKING:
-    from ..dependencies import ExternalProgram
+    from ..programs import ExternalProgram
     from ..envconfig import MachineInfo
     from ..environment import Environment
     from ..linkers import DynamicLinker
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index 7354d58f7..285d49092 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -25,10 +25,10 @@ from .compilers import Compiler, rust_buildtype_args, clike_debug_args
 
 if T.TYPE_CHECKING:
     from ..coredata import KeyedOptionDictType
-    from ..dependencies import ExternalProgram
     from ..envconfig import MachineInfo
     from ..environment import Environment  # noqa: F401
     from ..linkers import DynamicLinker
+    from ..programs import ExternalProgram
 
 
 rust_optimization_args = {