Merge branch 'dev' into feature/#151/represent-local-env

benoit-dubreuil · Apr 26, 2021 · f9dbf11 · f9dbf11
2 parents 106e445 + 6d27523
commit f9dbf11
Show file tree

Hide file tree

Showing 27 changed files with 24 additions and 24 deletions.
diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/cli.py b/conf/script/src/build_system/cmd/compiler/host/get_info/cli.py
@@ -6,7 +6,7 @@
 from typing import Any, Callable, Optional
 
 from build_system.compiler import *
-from ext.cli import *
+from cli import *
 
 
 def fetch_compiler_info(compiler_family: CompilerFamily,

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/__main__.py b/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/version/clang/__main__.py b/conf/script/src/build_system/cmd/compiler/host/get_info/version/clang/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/version/gcc/__main__.py b/conf/script/src/build_system/cmd/compiler/host/get_info/version/gcc/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/version/msvc/__main__.py b/conf/script/src/build_system/cmd/compiler/host/get_info/version/msvc/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/__main__.py b/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import AnyPath
 from file_structure import *
 from .impl import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_build_dir/__main__.py b/conf/script/src/build_system/cmd/hierarchy/create_build_dir/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/create_build_dir/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import AnyPath
 from file_structure import *
 from .impl import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/__main__.py b/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/cli.py b/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import *
 from file_structure import *
 from .impl import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_build_dir/__main__.py b/conf/script/src/build_system/cmd/hierarchy/find_build_dir/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/find_build_dir/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import *
 from file_structure import *
 from .impl import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/__main__.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import AnyPath
 from file_structure import *
 from .impl import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_root_dir/__main__.py b/conf/script/src/build_system/cmd/hierarchy/find_root_dir/__main__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from ext.cli import *
+from cli import *
 from . import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_root_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/find_root_dir/cli.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/setup/__main__.py b/conf/script/src/build_system/cmd/setup/__main__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 from . import *
-from ext.cli import *
+from cli import *
 
 
 def main():

diff --git a/conf/script/src/build_system/cmd/setup/_priv/meson/meson_utils.py b/conf/script/src/build_system/cmd/setup/_priv/meson/meson_utils.py
@@ -10,7 +10,7 @@
 from build_system.build_target import *
 from build_system.cmd.setup._priv.cli import *
 from build_system.compiler import *
-from ext.cli import *
+from cli import *
 from ext.cmd_integrity import *
 from ext.error import *
 from file_structure import *

diff --git a/conf/script/src/build_system/cmd/setup/pub/cli_setup.py b/conf/script/src/build_system/cmd/setup/pub/cli_setup.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.cli import *
+from cli import *
 from ext.more_typing import *
 from file_structure import *
 from .setup import *

diff --git a/conf/script/src/ext/cli/__init__.py → conf/script/src/cli/__init__.py b/conf/script/src/ext/cli/__init__.py → conf/script/src/cli/__init__.py
diff --git a/conf/script/src/ext/cli/arg.py → conf/script/src/cli/arg.py b/conf/script/src/ext/cli/arg.py → conf/script/src/cli/arg.py
diff --git a/conf/script/src/ext/cli/arg_parsing.py → conf/script/src/cli/arg_parsing.py b/conf/script/src/ext/cli/arg_parsing.py → conf/script/src/cli/arg_parsing.py
@@ -6,8 +6,8 @@
 from typing import AnyStr, Optional
 
 from .arg import *
-from ..error import *
-from ..more_typing import *
+from ext.error import *
+from ext.more_typing import *
 
 
 def add_optional_path_arg(arg_parser: argparse.ArgumentParser, path_arg: CLIArg = CLIArg.create_default_path_arg(),

diff --git a/conf/script/src/ext/cli/hidden_prints.py → conf/script/src/cli/hidden_prints.py b/conf/script/src/ext/cli/hidden_prints.py → conf/script/src/cli/hidden_prints.py
diff --git a/conf/script/src/ext/cli/main.py → conf/script/src/cli/main.py b/conf/script/src/ext/cli/main.py → conf/script/src/cli/main.py
diff --git a/conf/script/src/ext/cli/try_cmd.py → conf/script/src/cli/try_cmd.py b/conf/script/src/ext/cli/try_cmd.py → conf/script/src/cli/try_cmd.py
@@ -3,7 +3,7 @@
 import argparse
 from typing import Callable
 
-from ..error import *
+from ext.error import *
 
 
 def try_cmd_except_managed_errors(cmd_func: Callable, arg_parser: argparse.ArgumentParser):

diff --git a/conf/script/src/file_structure/fs_cmd_cli.py b/conf/script/src/file_structure/fs_cmd_cli.py
@@ -2,7 +2,7 @@
            'ROOT_DIR_ARG',
            'BUILD_DIR_ARG']
 
-from ext.cli import *
+from cli import *
 from ._type_alias import *
 from .fs_build_dir import *
 from .fs_root_dir import *