Architectural Support: x86_64 (#37)

[lunaix-os.git] / 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 3d7f21a92980ab35f3ca5f427017b697a1291ad8..f5893c6e6cb110afd4c947cd525def1c01cac429 100755 (executable)
--- a/lunaix-os/scripts/build-tools/luna_build.py
+++ b/lunaix-os/scripts/build-tools/luna_build.py
@@ -28,21 +28,23 @@ 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.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
 
 
     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)
 
     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)
 def do_buildfile_gen(opts, lcfg_env):
     root_path = abspath(opts.root)
     ws_path = dirname(root_path)


@@ -70,6 +72,8 @@ def main():
     parser = ArgumentParser()
     parser.add_argument("--config", action="store_true", default=False)
     parser.add_argument("--lconfig-file", default="LConfig")
     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)
 
     parser.add_argument("root", nargs="?", default="LBuild")
     parser.add_argument("-o", "--out-dir", required=True)
 


@@ -79,12 +83,22 @@ def main():
         mkdir(out_dir)
     
     lcfg_env = prepare_lconfig_env(out_dir)
         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:
     if opts.config:

-        do_config(lcfg_env)
+        if require_config:
+            do_config(opts, lcfg_env)
+        else:
+            print("No configuration file detected, skipping...")
+        lcfg_env.save(opts.config_save)
+        lcfg_env.export()

     else:
         do_buildfile_gen(opts, lcfg_env)
 
     else:
         do_buildfile_gen(opts, lcfg_env)