From 7951145fe01f73f3acce1202c82ffd56f3ceeafc Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Mon, 20 Mar 2023 12:39:37 +0200
Subject: [PATCH] wip

[skip build]
[skip test]
---
 aedi/target/special.py    | 11 ++++++-----
 aedi/target/tool_tier2.py | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/aedi/target/special.py b/aedi/target/special.py
index 9bd5bf9b..067f43d3 100644
--- a/aedi/target/special.py
+++ b/aedi/target/special.py
@@ -20,16 +20,17 @@ import shlex
 import shutil
 import subprocess
 
+import base
+
 from ..state import BuildState
-from .base import BuildTarget, Target
 
 
-class BuildPrefix(Target):
+class BuildPrefix(base.Target):
     def __init__(self, name='build-prefix'):
         super().__init__(name)
 
 
-class CleanTarget(Target):
+class CleanTarget(base.Target):
     def __init__(self, name=None):
         super().__init__(name)
         self.args = ()
@@ -55,7 +56,7 @@ class CleanDepsTarget(CleanAllTarget):
         self.args += (state.deps_path,)
 
 
-class DownloadCMakeTarget(Target):
+class DownloadCMakeTarget(base.Target):
     def __init__(self, name='download-cmake'):
         super().__init__(name)
 
@@ -76,7 +77,7 @@ class DownloadCMakeTarget(Target):
         shutil.rmtree(state.source)
 
 
-class TestDepsTarget(BuildTarget):
+class TestDepsTarget(base.BuildTarget):
     def __init__(self, name='test-deps'):
         super().__init__(name)
         self.multi_platform = False
diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py
index d704a4e3..525a70cd 100644
--- a/aedi/target/tool_tier2.py
+++ b/aedi/target/tool_tier2.py
@@ -16,10 +16,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from .base import *
+import subprocess
+
+import base
+
+from ..state import BuildState
 
 
-class GlslangTarget(CMakeStaticDependencyTarget):
+class GlslangTarget(base.CMakeStaticDependencyTarget):
     def __init__(self, name='glslang'):
         super().__init__(name)
 
@@ -37,7 +41,7 @@ class GlslangTarget(CMakeStaticDependencyTarget):
         super().configure(state)
 
 
-class P7ZipTarget(CMakeTarget):
+class P7ZipTarget(base.CMakeTarget):
     def __init__(self, name='p7zip'):
         super().__init__(name)
         self.src_root = 'CPP/7zip/CMAKE/7za'
@@ -55,7 +59,7 @@ class P7ZipTarget(CMakeTarget):
         self.copy_to_bin(state, '7za')
 
 
-class PbzxTarget(SingleExeCTarget):
+class PbzxTarget(base.SingleExeCTarget):
     def __init__(self, name='pbzx'):
         super().__init__(name)
         self.options = ('pbzx.c', '-lxar', '-llzma')
@@ -70,7 +74,7 @@ class PbzxTarget(SingleExeCTarget):
         return state.has_source_file('pbzx.c')
 
 
-class QPakManTarget(CMakeTarget):
+class QPakManTarget(base.CMakeTarget):
     def __init__(self, name='qpakman'):
         super().__init__(name)
 
@@ -83,7 +87,7 @@ class QPakManTarget(CMakeTarget):
         self.copy_to_bin(state)
 
 
-class SeverZipTarget(MakeTarget):
+class SeverZipTarget(base.MakeTarget):
     # Build with --os-version-x64=10.13 command line option
 
     def __init__(self, name='7zip'):
@@ -125,7 +129,7 @@ class SeverZipTarget(MakeTarget):
         return 'x64' if arch == 'x86_64' else arch
 
 
-class UnrarTarget(MakeTarget):
+class UnrarTarget(base.MakeTarget):
     def __init__(self, name='unrar'):
         super().__init__(name)
 
@@ -141,7 +145,7 @@ class UnrarTarget(MakeTarget):
         return state.has_source_file('rar.hpp')
 
 
-class ZipTarget(SingleExeCTarget):
+class ZipTarget(base.SingleExeCTarget):
     def __init__(self, name='zip'):
         super().__init__(name)
         self.options = (