X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/1025235c72c31f7fa7b648c0e32ddcaa68a8f66a..383318a4381375add624530005a803bd934ceec7:/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 848ceb6..e3c6908 100755
--- a/lunaix-os/scripts/build-tools/luna_build.py
+++ b/lunaix-os/scripts/build-tools/luna_build.py
@@ -7,6 +7,7 @@ from lcfg.common import LConfigEnvironment
 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
 
 import lcfg.types as lcfg_type
 import lcfg.builtins as builtin
@@ -26,27 +27,33 @@ def prepare_lconfig_env(out_dir):
     env.register_builtin_func(builtin.parent)
     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):
+def do_config(opt, lcfg_env):
+    redo_config = not exists(opt.config_save) or opt.force
+    if not redo_config:
+        return
+    
     shell = InteractiveShell(lcfg_env)
     if not shell.render_loop():
         print("Configuration aborted.")
         exit(-1)
 
-    lcfg_env.export()
-    lcfg_env.save()
-
 def do_buildfile_gen(opts, lcfg_env):
     root_path = abspath(opts.root)
     ws_path = dirname(root_path)
     root_name = basename(root_path)
 
-    env = BuildEnvironment(ws_path)
+    mkgen = MakefileBuildGen(opts.out_dir)
+    env = BuildEnvironment(ws_path, mkgen)
+
+    install_lbuild_functions(env)
 
     cfg_provider = LConfigProvider(lcfg_env)
     env.set_config_provider(cfg_provider)
@@ -59,12 +66,14 @@ def do_buildfile_gen(opts, lcfg_env):
         print("failed to resolve root build file")
         raise err
     
-    env.export(opts.out_dir)
+    env.export()
 
 def main():
     parser = ArgumentParser()
     parser.add_argument("--config", 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)
 
@@ -74,12 +83,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)