lbkit 0.9.10__tar.gz → 0.9.11__tar.gz

{lbkit-0.9.10/lbkit.egg-info → lbkit-0.9.11}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.10
+Version: 0.9.11
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
 Author-email: xuhj@litebmc.com
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: pyyaml
 Requires-Dist: colorama

lbkit-0.9.11/lbkit/__commit__.py

@@ -0,0 +1 @@
+__commit__ = '1f8eb04'

lbkit-0.9.11/lbkit/__init__.py

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

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/build_conan_parallel.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """任务基础类"""
 import os
 import json

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/cli.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """lbkit命令行入口"""
 import inspect
 import os
@@ -6,6 +12,10 @@ import sys
 import argparse
 import traceback
 from lbkit import __version__ as client_version
+try:
+    from lbkit.__commit__ import __commit__ as client_commit
+except ImportError:
+    client_commit = ""
 from lbkit.codegen.codegen import CodeGen
 from lbkit.component.build import BuildComponent
 from lbkit.component.test import TestComponent
@@ -16,6 +26,7 @@ from lbkit import misc
 from lbkit import errors
 from lbkit.ukr.build import UKRBuild
 from lbkit.utils.env_detector import EnvDetector
+from lbkit.skill.manager import sync as skill_sync
 
 log = Logger()
 
@@ -60,15 +71,6 @@ class Command(object):
         gen = CodeGen(argv)
         gen.run()
 
-    # new package
-    def new(self, *args):
-        """
-        按LiteBmc最佳实践创建一个新的组件.
-
-        你需要指定你需要使用的编程语言，当前仅支持C(基于litebmc框架)和C++(基于openbmc的sdbusplus)
-        """
-        log.info("new package")
-
     # build package
     def build(self, *args):
         """
@@ -105,13 +107,22 @@ class Command(object):
         build = TestComponent(argv)
         build.run()
 
+    def skill(self, *args):
+        """
+        同步AI技能包.
+
+        从技能仓库下载并复制所有skills到用户全局技能库(~/.claude/skills)
+        """
+        skill_sync()
+
     def _show_help(self):
         """
         Prints a summary of all commands.
         """
         grps = [("Code Generate commands", ["gen"]),
-                ("Build Component commands", ["new", "build", "test"]),
+                ("Build Component commands", ["build", "test"]),
                 ("Build Product commands", ["build"]),
+                ("AI Skill commands", ["skill"]),
                 ("Misc commands", ["help"]),
                ]
 
@@ -194,7 +205,10 @@ class Command(object):
                 method = commands[command]
             except KeyError as exc:
                 if command in ["-v", "--version"]:
-                    log.info("LiteBmc version %s" % client_version)
+                    ver = f"LiteBmc version {client_version}"
+                    if client_commit:
+                        ver += f" (commit {client_commit})"
+                    log.info(ver)
                     return False
 
                 self._warn_python_version()
@@ -215,17 +229,17 @@ class Command(object):
             if exc.code != 0:
                 log.error("Exiting with code: %d" % exc.code)
             ret_code = exc.code
-        except (errors.LiteBmcException, errors.RunCommandException, errors.ArgException, errors.PackageConfigException, Exception, errors.OdfValidateException) as exc:
+        except errors.TestException as exc:
+            log.error("lbk exit with exception:")
+            log.error(exc)
+            ret_code = -1
+        except Exception as exc:
             log.error("lbk exit with exception:")
             if os.environ.get("LOG"):
                 print(traceback.format_exc())
             ret_code = -1
             msg = str(exc)
             log.error(msg)
-        except errors.TestException:
-            log.error("lbk exit with exception:")
-            log.error(exc)
-            ret_code = -1
 
         return ret_code
 

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/codegen.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """
     DBus接口代码自动生成
 """

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/ctype_defination.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """语言相关类型定义"""
 import sys
 from lbkit.errors import OdfValidateException

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/idf_interface.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 import os
 import re
 import copy

lbkit-0.9.11/lbkit/codegen/renderer.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+from mako.lookup import TemplateLookup
+
+class Renderer(object):
+    def __init__(self):
+        super(Renderer, self).__init__()
+
+    def render(self, lookup: TemplateLookup, template, **kwargs):
+        t = lookup.get_template(template)
+        return t.render(lookup=lookup, **kwargs)

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/template/client.c.mako

@@ -1,6 +1,21 @@
 <%
 from inflection import underscore
 %>\
+/*
+ * Copyright (c) 2021-2024 litebmc.com
+ * Auto-generated by lbkit, DO NOT EDIT.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ **/
+
 #include "lb_base.h"
 #include "${intf.alias}.h"
 
@@ -31,46 +46,6 @@ gint ${class_name}_set_${prop.name}(${class_name} obj,
     return lb_impl.write_property((LBO *)obj, &${properties}.${prop.name}, tmp, error);
 }
 
-% endif
-## 私有或只写属性不允许读
-% if not prop.private and prop.access != "write":
-    % if prop.deprecated:
-__deprecated gint ${class_name}_get_${prop.name}(${class_name} obj,
-    ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
-    % else:
-gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
-    % endif
-{
-    % if "gsize n_" in prop.declare()[0]:
-    g_assert(n_value && value);
-    % else:
-    g_assert(value);
-    % endif
-    % for line in prop.declare():
-        % if "*" in line:
-    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")} = NULL;
-        % else:
-    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")};
-        % endif
-    % endfor
-    GVariant *out = NULL;
-
-    gint ret = lb_impl.read_property((LBO *)obj, &${properties}.${prop.name}, &out, error);
-    if (ret == 0 && out) {
-    % for line in prop.decode_func():
-        ${line.replace("<arg_in>", "tmp_value").replace("<arg_name>", "out")};
-    % endfor
-        *value = tmp_value;
-    % if "gsize n_" in prop.declare()[0]:
-        *n_value = n_tmp_value;
-    % endif
-    }
-    if (out) {
-        g_variant_unref(out);
-    }
-    return ret;
-}
-
 % endif
 % endfor
 
@@ -155,7 +130,7 @@ static void _${class_name}_destroy(LBO *obj)
  */
 static LBO *_${class_name}_create(const gchar *name, gpointer opaque)
 {
-    struct _${intf.alias} *obj = g_new0(struct _${intf.alias}, 1);
+    struct _${intf.alias} *obj = g_malloc0(sizeof(struct _${intf.alias}) + sizeof(GVariant *) * ${intf.alias}_PROP_COUNT);
     memcpy(obj->_base.magic, LB_MAGIC, strlen(LB_MAGIC) + 1);
     obj->_base.lock = g_new0(GRecMutex, 1);
     g_rec_mutex_init(obj->_base.lock);

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/template/client.h.mako

@@ -1,4 +1,19 @@
 <% from lbkit.tools import hump2underline %>\
+/*
+ * Copyright (c) 2021-2024 litebmc.com
+ * Auto-generated by lbkit, DO NOT EDIT.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ **/
+
 #ifndef __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
 #define __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
 
@@ -35,13 +50,6 @@ __deprecated gint ${class_name}_set_${prop.name}(${class_name} obj, ${", ".join(
 gint ${class_name}_set_${prop.name}(${class_name} obj, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
     % endif
 % endif
-% if not prop.private and prop.access != "write":
-    % if prop.deprecated:
-__deprecated gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
-    % else:
-gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
-    % endif
-% endif
 % endif
 % endfor
 
@@ -189,6 +197,178 @@ static inline void _cleanup_${class_name}_list(GSList **ptr)
 
 #define cleanup_${class_name} __attribute__((cleanup(_cleanup_${class_name}_)))
 #define cleanup_${class_name}_list __attribute__((cleanup(_cleanup_${class_name}_list)))
+<%!
+import re
+
+def out_decl_to_local_var(decl):
+    s = decl.replace("<const>", "").replace("<arg_name>", "value").strip()
+    if '***' in s:
+        s = s.replace('***', '**', 1)
+    elif '**' in s:
+        s = s.replace('**', '*', 1)
+    elif ' *' in s:
+        s = s.replace(' *', ' ', 1)
+    return s.strip()
+
+def out_decl_to_type(decl):
+    local = out_decl_to_local_var(decl)
+    if local.endswith("value"):
+        prefix = local[:-5]
+        if prefix.endswith("n_"):
+            return prefix[:-2].strip()
+        return prefix.rstrip() if prefix.endswith(' ') else prefix
+    return local
+
+def is_count_param(decl):
+    return "n_<arg_name>" in decl
+
+def out_decl_to_ptr_param(decl):
+    return decl.replace("<const>", "").replace("<arg_name>", "value_ptr")
+
+def is_ptr_local(decl):
+    s = out_decl_to_local_var(decl)
+    return '*' in s
+
+def get_cleanup_attr(prop):
+    free_lines = prop.free_func()
+    if not free_lines:
+        return None
+    free_str = " ".join(free_lines)
+    if "lb_strfreev_p" in free_str:
+        return "cleanup_strv"
+    elif "lb_unref_p" in free_str:
+        return "cleanup_unref"
+    elif "_free_v(&<arg_name>)" in free_str:
+        return None
+    elif "_free(&<arg_name>)" in free_str:
+        return None
+    elif "lb_free_p" in free_str:
+        return "cleanup_gpointer"
+    return None
+
+def needs_custom_cleanup(prop):
+    free_lines = prop.free_func()
+    if not free_lines:
+        return False
+    free_str = " ".join(free_lines)
+    return "_free_v(&<arg_name>)" in free_str or "_free(&<arg_name>)" in free_str
+
+def free_line_to_cleanup(line, ptr_name="value_ptr"):
+    return line.replace("<arg_name>", "(*%s)" % ptr_name)
+
+_bs = chr(92)
+%>\
+% for prop in intf.properties:
+    % if not prop.private and prop.access != "write":
+<%
+out_decls_getter = prop.out_declare()
+%>\
+    % if prop.deprecated:
+__deprecated static inline gint _${class_name}_get_${prop.name}_val(${class_name} obj,
+    ${", ".join(out_decls_getter).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
+    % else:
+static inline gint _${class_name}_get_${prop.name}_val(${class_name} obj, ${", ".join(out_decls_getter).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
+    % endif
+{
+    % if "gsize n_" in prop.declare()[0]:
+    g_assert(n_value && value);
+    % else:
+    g_assert(value);
+    % endif
+    % for line in prop.declare():
+        % if "*" in line:
+    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")} = NULL;
+        % else:
+    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")};
+        % endif
+    % endfor
+    GVariant *out = NULL;
+    gint ret = lb_impl.read_property((LBO *)obj, &${class_name}_properties()->${prop.name}, &out, error);
+    if (ret == 0 && out) {
+        % for line in prop.decode_func():
+        ${line.replace("<arg_in>", "tmp_value").replace("<arg_name>", "out")};
+        % endfor
+        *value = tmp_value;
+    % if "gsize n_" in prop.declare()[0]:
+        *n_value = n_tmp_value;
+    % endif
+    }
+    if (out) {
+        g_variant_unref(out);
+    }
+    return ret;
+}
+
+    % endif
+% endfor
+
+% for prop in intf.properties:
+    % if not prop.private and prop.access != "write":
+static inline GVariant *_${class_name}_get_${prop.name}_variant(${class_name} obj)
+{
+    g_assert(obj);
+    GVariant *out = NULL;
+    lb_impl.read_property((LBO *)obj, &${class_name}_properties()->${prop.name}, &out, NULL);
+    return out;
+}
+
+#define ${class_name}_get_${prop.name}(obj, _val) \
+    cleanup_unref GVariant *_val = _${class_name}_get_${prop.name}_variant(obj)
+    % endif
+% endfor
+
+% for prop in intf.properties:
+    % if not prop.private and prop.access != "write" and needs_custom_cleanup(prop):
+<%
+free_lines = prop.free_func()
+out_decls = prop.out_declare()
+%>\
+static inline void _cleanup_${class_name}_get_${prop.name}_val(${", ".join([out_decl_to_ptr_param(d) for d in out_decls])})
+{
+    % for line in free_lines:
+    ${free_line_to_cleanup(line)};
+    % endfor
+}
+    % endif
+% endfor
+% for prop in intf.properties:
+    % if not prop.private and prop.access != "write":
+<%
+free_lines = prop.free_func()
+out_decls = prop.out_declare()
+has_cleanup = len(free_lines) > 0
+cleanup_attr = get_cleanup_attr(prop)
+custom_cleanup = needs_custom_cleanup(prop)
+%>\
+#define ${class_name}_get_${prop.name}_val(obj, _val, _err, _ret) ${_bs}
+    % for d in out_decls:
+        % if is_count_param(d):
+    ${out_decl_to_type(d)} n_##_val = 0; ${_bs}
+        % else:
+            % if is_ptr_local(d):
+                % if custom_cleanup:
+    __attribute__((cleanup(_cleanup_${class_name}_get_${prop.name}_val))) ${_bs}
+                % elif cleanup_attr:
+    ${cleanup_attr} ${_bs}
+                % endif
+    ${out_decl_to_type(d)} _val = NULL; ${_bs}
+            % else:
+    ${out_decl_to_type(d)} _val = 0; ${_bs}
+            % endif
+        % endif
+    % endfor
+    _ret = _${class_name}_get_${prop.name}_val(obj\
+    % for d in out_decls:
+        % if is_count_param(d):
+, &n_##_val\
+        % else:
+, &_val\
+        % endif
+    % endfor
+, &_err)
+
+    % endif
+% endfor
 #ifdef __cplusplus
 }
 #endif

{lbkit-0.9.10 → lbkit-0.9.11}/lbkit/codegen/template/interface.introspect.xml.mako

@@ -1,3 +1,10 @@
+<!-- Copyright (c) 2021-2024 litebmc.com -->
+<!-- Auto-generated by lbkit, DO NOT EDIT. -->
+<!-- This library is free software; you can redistribute it and/or modify it -->
+<!-- under the terms of the GNU Lesser General Public License as published by the -->
+<!-- Free Software Foundation; either version 2.1 of the License, or (at your -->
+<!-- option) any later version. -->
+
 <!DOCTYPE node PUBLIC
 "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">