X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/29891c3ccec4f1d28e0440d87ea2e2708377d2ee..50b4ecfb1b28e9b1dfc57b6a876fcdf938092152:/lunaix-os/scripts/build-tools/luna_build.py

diff --git a/lunaix-os/scripts/build-tools/luna_build.py b/lunaix-os/scripts/build-tools/luna_build.py
index 3d7f21a..ce3be82 100755
--- a/lunaix-os/scripts/build-tools/luna_build.py
+++ b/lunaix-os/scripts/build-tools/luna_build.py
@@ -8,6 +8,7 @@ from integration.config_io import CHeaderConfigProvider
 from integration.lbuild_bridge import LConfigProvider
 from integration.render_ishell import InteractiveShell
 from integration.build_gen import MakefileBuildGen, install_lbuild_functions
+from integration.lunamenu import menuconfig, TerminalSizeCheckFailed
 
 import lcfg.types as lcfg_type
 import lcfg.builtins as builtin
@@ -28,20 +29,33 @@ def prepare_lconfig_env(out_dir):
     env.register_builtin_func(builtin.default)
     env.register_builtin_func(builtin.include)
     env.register_builtin_func(builtin.env)
+    env.register_builtin_func(builtin.set_value)
 
     env.type_factory().regitser(lcfg_type.PrimitiveType)
     env.type_factory().regitser(lcfg_type.MultipleChoiceType)
 
     return env
 
-def do_config(lcfg_env):
-    shell = InteractiveShell(lcfg_env)
-    if not shell.render_loop():
-        print("Configuration aborted.")
-        exit(-1)
+def do_config(opt, lcfg_env):
+    redo_config = not exists(opt.config_save) or opt.force
+    if not redo_config or opt.quiet:
+        return
 
-    lcfg_env.export()
-    lcfg_env.save()
+    try:
+        clean_quit = menuconfig(lcfg_env)
+    except TerminalSizeCheckFailed as e:
+        least = e.args[0]
+        current = e.args[1]
+        print(
+            f"Your terminal size: {current} is less than minimum requirement of {least}.\n"
+            "menuconfig will not function properly, switch to prompt based.\n")
+
+        shell = InteractiveShell(lcfg_env)
+        clean_quit = shell.render_loop()
+    
+    if not clean_quit:
+        print("Configuration aborted. Nothing has been saved.")
+        exit(-1)
 
 def do_buildfile_gen(opts, lcfg_env):
     root_path = abspath(opts.root)
@@ -69,7 +83,10 @@ def do_buildfile_gen(opts, lcfg_env):
 def main():
     parser = ArgumentParser()
     parser.add_argument("--config", action="store_true", default=False)
+    parser.add_argument("--quiet", action="store_true", default=False)
     parser.add_argument("--lconfig-file", default="LConfig")
+    parser.add_argument("--config-save", default=".config.json")
+    parser.add_argument("--force", action="store_true", default=False)
     parser.add_argument("root", nargs="?", default="LBuild")
     parser.add_argument("-o", "--out-dir", required=True)
 
@@ -79,12 +96,24 @@ def main():
         mkdir(out_dir)
     
     lcfg_env = prepare_lconfig_env(out_dir)
-    lcfg_env.resolve_module(opts.lconfig_file)
-    lcfg_env.update()
-    lcfg_env.load()
-
+    require_config = exists(opts.lconfig_file)
+    try:
+        if require_config:
+            lcfg_env.resolve_module(opts.lconfig_file)
+            lcfg_env.update()
+            lcfg_env.load()
+    except Exception as e:
+        print(e)
+    
     if opts.config:
-        do_config(lcfg_env)
+        if require_config:
+            do_config(opts, lcfg_env)
+        else:
+            print("No configuration file detected, skipping...")
+        
+        lcfg_env.update()
+        lcfg_env.save(opts.config_save)
+        lcfg_env.export()
     else:
         do_buildfile_gen(opts, lcfg_env)