Merge branch 'dev' into feature/#135/save-compiler-env

conf/script/src/build_system/cmd/setup/__main__.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-import build_system.cmd.setup.cli
+import build_system.cmd.setup.cli.impl
 import utils.cli.main
 
 
 def main():
-    build_system.cmd.setup.cli.setup()
+    build_system.cmd.setup.cli.impl.setup()
 
 
 utils.cli.main.wrap_main(main)

conf/script/src/build_system/cmd/setup/cli_color.py → conf/script/src/build_system/cmd/setup/cli/colorize.py

@@ -3,7 +3,7 @@
 from utils.more_typing import PathLike
 
 
-def colorize_header_laber(header: str) -> str:
+def colorize_header_label(header: str) -> str:
     return colorama.Fore.LIGHTCYAN_EX + header + colorama.Style.RESET_ALL
 
 

conf/script/src/build_system/cmd/setup/cli_print_symlink_to_compiler_export_shell_env.py → conf/script/src/build_system/cmd/setup/cli/compiler_shell_env.py

@@ -4,7 +4,7 @@
 
 
 def print_symlink_to_compiler_export_shell_env_script(target: build_system.build_target.build_target.BuildTarget) -> None:
-    from build_system.cmd.setup.cli_color import colorize_label, colorize_path
+    from build_system.cmd.setup.cli.colorize import colorize_label, colorize_path
 
     label: Final[str] = colorize_label(label='Symlink to compiler export shell env vars script') + ': '
 

conf/script/src/build_system/cmd/setup/cli_print_meson_cmd.py → conf/script/src/build_system/cmd/setup/cli/meson.py

@@ -5,7 +5,7 @@
 
 
 def print_meson_main_file(meson_main_file: Path) -> None:
-    from build_system.cmd.setup.cli_color import colorize_label, colorize_path
+    from build_system.cmd.setup.cli.colorize import colorize_label, colorize_path
 
     meson_cmd_label: Final[str] = colorize_label(label=f'{BUILD_SYSTEM_NAME.capitalize()} main file') + ': '
 
@@ -16,7 +16,7 @@ def print_meson_main_file(meson_main_file: Path) -> None:
 
 
 def print_meson_cmd(meson_cli_args: list[str]) -> None:
-    from build_system.cmd.setup.cli_color import colorize_label, colorize_path
+    from build_system.cmd.setup.cli.colorize import colorize_label, colorize_path
 
     meson_cmd_label: Final[str] = colorize_label(label=f'{BUILD_SYSTEM_NAME.capitalize()} cmd') + ': '
 

conf/script/src/build_system/cmd/setup/cli_print_target_info.py → conf/script/src/build_system/cmd/setup/cli/target_info.py

@@ -9,7 +9,7 @@
 def print_target_info(compiler_instance: build_system.compiler.installed_instance.CompilerInstance,
                       target: build_system.build_target.build_target.BuildTarget,
                       compiler_env_manager: contextlib.AbstractContextManager) -> None:
-    from build_system.cmd.setup.cli_color import colorize_label, colorize_path, colorize_header_laber
+    from build_system.cmd.setup.cli.colorize import colorize_label, colorize_path, colorize_header_label
 
     def print_indented_label_and_info(pre_label_indent: str = str(),
                                       post_label_indent: str = str(),
@@ -102,7 +102,7 @@ def print_post_header_labels_and_info(pre_label_indent: str = str(),
     white_space: Final[str] = ' '
 
     header_label = r'Target'
-    header_colorized_label = colorize_header_laber(header=header_label)
+    header_colorized_label = colorize_header_label(header=header_label)
     post_header_indent = white_space * 6
     header_total_indent = (white_space * len(header_label)) + post_header_indent
 

conf/script/src/build_system/cmd/setup/meson_machine_file_cli_args.py → conf/script/src/build_system/cmd/setup/meson_machine_file_args.py

@@ -6,8 +6,8 @@
 from build_system.cmd.setup.find_meson_machine_file import find_build_type_machine_file, find_compiler_machine_file, find_native_machine_files_dir, find_sanitizer_machine_file
 
 
-def generate_meson_machine_files_cli_args(compiler_instance: build_system.compiler.installed_instance.CompilerInstance,
-                                          build_target: build_system.build_target.build_target.BuildTarget) -> list[str]:
+def generate_meson_machine_files_args(compiler_instance: build_system.compiler.installed_instance.CompilerInstance,
+                                      build_target: build_system.build_target.build_target.BuildTarget) -> list[str]:
     import build_system.cmd.hierarchy.find_conf_dir
 
     meson_machine_files_dir = build_system.cmd.hierarchy.find_conf_dir.find_meson_machine_files_dir()
@@ -18,10 +18,10 @@ def generate_meson_machine_files_cli_args(compiler_instance: build_system.compil
                                             meson_machine_files_dir=meson_machine_files_dir,
                                             native_machine_files_dir=native_machine_files_dir)
 
-    machine_files_cli_args: list[str] = _machine_files_to_cli_args(machine_files=machine_files)
-    _insert_setup_cli_arg_native_file(machine_files_cli_args=machine_files_cli_args)
+    machine_files_args: list[str] = _machine_files_to_args(machine_files=machine_files)
+    _insert_setup_arg_native_file(machine_files_args=machine_files_args)
 
-    return machine_files_cli_args
+    return machine_files_args
 
 
 def _assemble_machine_files(compiler_instance: build_system.compiler.installed_instance.CompilerInstance,
@@ -36,13 +36,13 @@ def _assemble_machine_files(compiler_instance: build_system.compiler.installed_i
             meson_machine_files_dir / r'post-global.ini']
 
 
-def _machine_files_to_cli_args(machine_files: list[Path]) -> list[str]:
+def _machine_files_to_args(machine_files: list[Path]) -> list[str]:
     return [str(machine_file) for machine_file in machine_files]
 
 
-def _insert_setup_cli_arg_native_file(machine_files_cli_args: list[str]) -> None:
-    setup_cli_arg_native_file: Final[str] = r'--native-file'
+def _insert_setup_arg_native_file(machine_files_args: list[str]) -> None:
+    setup_arg_native_file: Final[str] = r'--native-file'
     step: Final[int] = 2
 
-    for i in range(0, len(machine_files_cli_args) * step, step):
-        machine_files_cli_args.insert(i, setup_cli_arg_native_file)
+    for i in range(0, len(machine_files_args) * step, step):
+        machine_files_args.insert(i, setup_arg_native_file)

conf/script/src/build_system/cmd/setup/meson_utils.py

@@ -11,9 +11,9 @@
 import utils.cmd_integrity
 import utils.error.cls_def
 from build_system.cmd.hierarchy.consts import BUILD_SYSTEM_NAME
-from build_system.cmd.setup.cli_print_meson_cmd import print_meson_cmd, print_meson_main_file
-from build_system.cmd.setup.cli_print_target_info import print_target_info
-from build_system.cmd.setup.meson_machine_file_cli_args import generate_meson_machine_files_cli_args
+from build_system.cmd.setup.cli.meson import print_meson_cmd, print_meson_main_file
+from build_system.cmd.setup.cli.target_info import print_target_info
+from build_system.cmd.setup.meson_machine_file_args import generate_meson_machine_files_args
 
 
 def setup_target(root_dir: Path,
@@ -51,7 +51,7 @@ def _generate_meson_setup_cli_args(root_dir: Path,
     meson_cli_args: list[str] = [cli_arg_setup_cmd,
                                  setup_cli_fatal_warnings,
                                  setup_cli_arg_build_type,
-                                 *(generate_meson_machine_files_cli_args(compiler_instance=compiler_instance, build_target=build_target)),
+                                 *(generate_meson_machine_files_args(compiler_instance=compiler_instance, build_target=build_target)),
                                  setup_cli_arg_build_dir,
                                  setup_cli_arg_source_dir]
 

conf/script/src/build_system/cmd/setup/setup_steps/step_create_symlimks_to_compilers_export_shell_env_script.py

@@ -15,7 +15,7 @@ def create_symlinks_to_compilers_export_shell_env_script(targets: list[build_sys
 
 def _create_symlinks_to_compilers_export_shell_env__script(target: build_system.build_target.build_target.BuildTarget,
                                                            cli_mode: bool):
-    from build_system.cmd.setup.cli_print_symlink_to_compiler_export_shell_env import print_symlink_to_compiler_export_shell_env_script
+    from build_system.cmd.setup.cli.compiler_shell_env import print_symlink_to_compiler_export_shell_env_script
 
     export_shell_env_script: Path = target.compiler_instance.get_export_shell_env_script()