lbkit 0.9.0__tar.gz → 0.9.2__tar.gz

{lbkit-0.9.0/lbkit.egg-info → lbkit-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.0
+Version: 0.9.2
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.2/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.2'

{lbkit-0.9.0 → lbkit-0.9.2}/lbkit/codegen/idf_interface.py

@@ -1209,12 +1209,12 @@ class IdfInterface(IdfInterfaceBase):
                 "ref_value": {
                     "type": "string",
                     "description": "Property reference syntax. The format must be `\\$\\{([<]*|:)<object>.<property name>\\}`, for example: Test_Obj.Prop",
-                    "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\.[A-Za-z][a-zA-Z0-9_-]*\\}$"
+                    "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\.[a-zA-Z][A-Za-z0-9_-]*\\}$"
                 },
                 "ref_obj": {
                     "type": "string",
                     "description": "Property reference syntax. The format must be `\\$\\{([<]*|:)<object>.<property name>\\}`, for example: Test_Obj",
-                    "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\}$"
+                    "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\}$"
                 },
                 "ref_obj_array": {
                     "type": "array",
@@ -1224,12 +1224,12 @@ class IdfInterface(IdfInterfaceBase):
                             {
                                 "type": "string",
                                 "description": "Object reference syntax. The format must be `\\$\\{([<]*|:)<object>\\}`, for example: Test_Obj",
-                                "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\}$"
+                                "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\}$"
                             },
                             {
                                 "type": "string",
                                 "description": "Plain string format, if the string start with `$` must add `\\` before `$` to escape; If the string is empty it must be surrounded by `\"`",
-                                "pattern": "^[/]?[A-Z0-9a-z_]+(/[A-Z0-9a-z_]+)*$"
+                                "pattern": "^/?[A-Z0-9a-z_]+(/[A-Z0-9a-z_]+)*$"
                             }
                         ]
                     }

{lbkit-0.9.0 → lbkit-0.9.2}/lbkit/codegen/template/public.h.mako

@@ -315,7 +315,7 @@ typedef struct {
 <% RSP_PARA = f'' %>\
 <% REQ_PARA = f'' %>\
     % if len(action.returns.parameters) > 0:
-<% RSP_PARA = f', {class_name}_{action.name}_Rsq **rsp' %>\
+<% RSP_PARA = f', {class_name}_{action.name}_Rsp **rsp' %>\
     % endif
     % if len(action.parameters.parameters) > 0:
 <% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\

{lbkit-0.9.0 → lbkit-0.9.2}/lbkit/ukr/build.py

@@ -2,27 +2,13 @@
 import os
 import yaml
 import shutil
-import re
-import json
-import tempfile
 from string import Template
-from multiprocessing import Pool
-import traceback
-from argparse import ArgumentParser
-from jsonschema import validate, ValidationError
-from git import Repo
-from git.exc import InvalidGitRepositoryError
-from mako.lookup import TemplateLookup
-from lbkit.misc import Color, load_yml_with_json_schema_validate, get_json_schema_file, load_json_schema
-from lbkit import errors
-from lbkit.codegen.codegen import CodeGen, history_versions
 from lbkit.tools import Tools
-from lbkit.build_conan_parallel import BuildConanParallel
-from lbkit.codegen.codegen import Version
 from lbkit.tasks.task_download import DownloadTask
 from lbkit.misc import DownloadFlag
 from lbkit.tools import Tools
 from lbkit.utils.env_detector import EnvDetector
+from lbkit.misc import load_yml_with_json_schema_validate
 
 
 tools = Tools("comp_build")
@@ -33,10 +19,25 @@ class SourceDest():
     def __init__(self, cfg):
         self.source = cfg.get("source")
         self.dest = cfg.get("dest")
+        self.pattern = cfg.get("pattern")
 
     def copy(self, source_dir, dest_dir, with_template, **kwargs):
         source = os.path.join(source_dir, self.source)
         dest = os.path.join(dest_dir, self.dest)
+        if self.pattern and os.path.isdir(source):
+            if not source.endswith("/"):
+                source += "/"
+            files = tools.pipe([f"find {source} -name {self.pattern}"], out_file=None).decode("utf-8").split("\n")
+            for file in files:
+                file = file.strip()
+                if not file:
+                    continue
+                new_dest = os.path.join(dest, file[len(source):])
+                self._copy(file, new_dest, with_template, **kwargs)
+        else:
+            self._copy(source, dest, with_template, **kwargs)
+
+    def _copy(self, source, dest, with_template, **kwargs):
         if os.path.isfile(dest):
             os.unlink(dest)
         dest_dir = os.path.dirname(dest)
@@ -86,9 +87,6 @@ class BuildGeneral():
         }
         task = DownloadTask(cfg, os.getcwd())
         task.start()
-        _, sha = DownloadFlag.read(self.dir_name)
-        if sha == sha256:
-            return
         cmd = f"tar -xf {task.dst} -C {self.dir_name}"
         if task.strip_components:
             cmd += f" --strip-components={task.strip_components}"
@@ -101,10 +99,15 @@ class BuildGeneral():
     def prepare_defconfig(self):
         defconf = self.cfg.get("defconfig")
         compiler_path=os.path.join(self.work_dir, "toolchain")
-        sd = SourceDest(defconf)
-        sd.copy(self.cwd, os.path.join(self.work_dir, self.dir_name), True, compiler_path=compiler_path)
+        if isinstance(defconf, list):
+            for conf in defconf:
+                sd = SourceDest(conf)
+                sd.copy(self.cwd, os.path.join(self.work_dir, self.dir_name), True, compiler_path=compiler_path)
+        else:
+            sd = SourceDest(defconf)
+            sd.copy(self.cwd, os.path.join(self.work_dir, self.dir_name), True, compiler_path=compiler_path)
         os.environ["ARCH"] = self.arch
-        os.environ["CROSS_COMPILE"] = self.cross_compile + "-"
+        os.environ["CROSS_COMPILE"] = os.path.join(compiler_path, "bin", self.cross_compile + "-")
         path = os.environ.get("PATH", "")
         if compiler_path not in path:
             path += ":" + compiler_path + "/bin"
@@ -113,13 +116,21 @@ class BuildGeneral():
 
     def build(self):
         os.chdir(self.dir_name)
-        cmd = f"make {self.defconfig}"
-        self.tools.exec(cmd, verbose=True)
-        if self.name == "compiler":
-            cmd = f"make sdk -j" + str(os.cpu_count())
+        cmds = self.cfg.get("cmds", [])
+        if cmds:
+            for cmd in cmds:
+                compiler = os.environ["CROSS_COMPILE"]
+                cmd = cmd.replace("${compiler}", compiler)
+                cmd = cmd.replace("${workdir}", self.dir_name)
+                self.tools.exec(cmd, verbose=True)
         else:
-            cmd = f"make -j" + str(os.cpu_count())
-        self.tools.exec(cmd, verbose=True)
+            cmd = f"make {self.defconfig}"
+            self.tools.exec(cmd, verbose=True)
+            if self.name == "compiler":
+                cmd = f"make sdk -j" + str(os.cpu_count())
+            else:
+                cmd = f"make -j" + str(os.cpu_count())
+            self.tools.exec(cmd, verbose=True)
 
     def tar_files(self):
         os.chdir(self.dir_name)
@@ -139,6 +150,8 @@ class BuildGeneral():
             sd.copy(self.dir_name, self.output, False)
 
     def run(self):
+        if not self.cfg:
+            return
         self.download()
         self.prepare_defconfig()
         self.build()
@@ -181,6 +194,59 @@ class BuildUBoot(BuildGeneral):
         super().__init__(config, cwd, "uboot", "uboot")
 
 
+class PreDownload():
+    def __init__(self, config, cwd):
+        self.cwd = cwd
+        self.cfg = config.get("predownload", [])
+
+    def run(self):
+        if not self.cfg:
+            return
+        for down in self.cfg:
+            url = down.get("url")
+            sha256 = down.get("sha256")
+            verify = down.get("verify", True)
+            destfile = down.get("destfile")
+            destfile = os.path.join(self.cwd, ".temp", destfile)
+            destfile = os.path.realpath(destfile)
+            if not destfile.startswith(self.cwd):
+                raise Exception(f"dest file {destfile} not startswith {self.cwd}")
+            destdir = os.path.dirname(destfile)
+            if not os.path.isdir(destdir):
+                os.makedirs(destdir)
+
+            tmpfile = os.path.join(self.cwd, ".temp", os.path.basename(url))
+
+            cfg = {
+                "url": url,
+                "file": tmpfile,
+                "decompress": {
+                    "dirname": self.cwd,
+                    "strip_components": 0
+                },
+                "sha256": sha256,
+                "verify": verify
+            }
+            task = DownloadTask(cfg, os.getcwd())
+            task.start()
+            if tmpfile != destfile:
+                shutil.copyfile(tmpfile, destfile)
+            decomp = down.get("decompress")
+            if not decomp:
+                continue
+            strip_components = decomp.get("strip_components", 0)
+            dirname = decomp.get("dirname")
+            if not dirname:
+                continue
+            dirname = os.path.join(self.cwd, ".temp", dirname)
+            if os.path.isdir(dirname):
+                shutil.rmtree(dirname)
+            os.makedirs(dirname)
+            cmd = f"tar -xf {task.dst} -C {dirname}"
+            if strip_components:
+                cmd += f" --strip-components={strip_components}"
+            tools.exec(cmd)
+
 class UKRBuild():
     def __init__(self, env_detector: EnvDetector):
         os.chdir(env_detector.ukr.folder)
@@ -188,8 +254,10 @@ class UKRBuild():
 
     def run(self):
         cwd = os.getcwd()
-        with open("config.yml") as fp:
-            cfg = yaml.full_load(fp)
+
+        cfg = load_yml_with_json_schema_validate("config.yml", "/usr/share/litebmc/schema/ukr_config.v1.json")
+        download = PreDownload(cfg, cwd)
+        download.run()
         build = BuildCompiler(cfg, cwd)
         build.run()
         build = BuildRootfs(cfg, cwd)
@@ -199,4 +267,4 @@ class UKRBuild():
         build = BuildUBoot(cfg, cwd)
         build.run()
         cmd = f"tar -czf {cwd}/.temp/output/firmware.tar.gz -C {cwd}/.temp/output/images ."
-        tools.exec(cmd)
+        tools.exec(cmd)

{lbkit-0.9.0 → lbkit-0.9.2}/lbkit/utils/images/emmc.py

@@ -68,14 +68,14 @@ class MakeImage():
         start = end
         end += self.rootfs_blk_1m * 1024 * 2
         self.tools.exec(f"parted -s -a none {output} mkpart rootfs_b {start}s {end - 1}s")
-        self.log.info("复制镜像文件到rootfs_b")
-        self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
+        # self.log.info("复制镜像文件到rootfs_b")
+        # self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
         self.log.info("制作rootfs_c")
         start = end
         end += self.rootfs_blk_1m * 1024 * 2
         self.tools.exec(f"parted -s -a none {output} mkpart rootfs_c {start}s {end - 1}s")
-        self.log.info("复制镜像文件到rootfs_c")
-        self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
+        # self.log.info("复制镜像文件到rootfs_c")
+        # self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
         start = end
         self.log.info("制作userdata区")
         end += self.userdata_blk_1m * 1024 * 2

{lbkit-0.9.0 → lbkit-0.9.2/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.0
+Version: 0.9.2
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

{lbkit-0.9.0 → lbkit-0.9.2}/test/test_codegen.py

@@ -33,10 +33,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_number_property(self, name, type, max, min, default_val):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -47,10 +47,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_string_property(self, name, type, pattern, default_val):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -61,10 +61,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_double_property(self, name, type, default_val, max=None, min=None, exclusive_max=None, exclusive_min=None):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -82,10 +82,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def validate_boolean(self, name, type, default):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -380,10 +380,10 @@ class TestCodegenPropertyFlagsClass(unittest.TestCase):
 
     def mk_interface_unique(self, type):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -446,10 +446,10 @@ class TestCodegenUniqueClass(unittest.TestCase):
 
     def mk_interface_unique(self, type, unique):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -548,10 +548,10 @@ class TestCodegenItemsCountClass(unittest.TestCase):
 
     def mk_interface_min_max_items(self, type, min_items=None, max_items=None):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -684,10 +684,10 @@ class TestCodegenItemsMatchesClass(unittest.TestCase):
 
     def mk_interface_property_matches(self, type, matches):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")

lbkit-0.9.0/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.9.0'