lbkit 0.9.6__tar.gz → 0.9.7__tar.gz

{lbkit-0.9.6/lbkit.egg-info → lbkit-0.9.7}/PKG-INFO

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

lbkit-0.9.7/lbkit/__init__.py

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

{lbkit-0.9.6 → lbkit-0.9.7}/lbkit/codegen/codegen.py

@@ -105,6 +105,7 @@ class CodeGen(object):
         Logger("codegen.log")
         self.args = args
         self.codegen_version = __version__
+        log.info(f"Codegen version: {self.codegen_version.str}")
         self.log_level = "NOTSET"
 
     def _gen(self, idf_file, directory=".", code_type="all"):
@@ -113,11 +114,13 @@ class CodeGen(object):
         code_types = ["server", "client", "public"]
         if code_type != "all":
             code_types = [code_type]
-        log.info(f"Codegen version: {self.codegen_version.str}")
         for ct in code_types:
             os.makedirs(os.path.join(directory, ct), exist_ok=True)
             out_file = os.path.join(directory, ct, interface.name + ".xml")
             interface.render_dbus_xml("interface.introspect.xml.mako", out_file)
+            # 确保生成xml的日志只打印一次
+            if ct == "public" or code_type == ct:
+                log.info("The sha256sum of interface {} is {}".format(out_file, interface.introspect_xml_sha256))
             out_file = os.path.join(directory, ct, interface.alias + ".h")
             interface.render_c_source(ct + ".h.mako", out_file)
             out_file = os.path.join(directory, ct, interface.alias + ".c")

{lbkit-0.9.6 → lbkit-0.9.7}/lbkit/codegen/idf_interface.py

@@ -41,6 +41,7 @@ class IdfInterfaceBase(Renderer):
         self.name = None
         self.object_path = None
         self.codegen_version = None
+        self.introspect_xml_sha256 = None
 
 class IdfAnnotation():
     def __init__(self, name, value):
@@ -1325,7 +1326,11 @@ class IdfInterface(IdfInterfaceBase):
         hash = hashlib.sha256()
         hash.update(out.encode('utf-8'))
         self.introspect_xml_sha256 = hash.hexdigest()
-        log.info("The sha256sum of interface {} is {}".format(out_file, self.introspect_xml_sha256))
+        # TODO: 2026-10-19 删除此兼容写法，仅保留带 sha256 后缀的输出
+        with open(out_file, "w") as fd:
+            fd.write(out)
+        base, ext = os.path.splitext(out_file)
+        out_file = f"{base}-{self.introspect_xml_sha256[:6]}{ext}"
         with open(out_file, "w") as fd:
             fd.write(out)
 

{lbkit-0.9.6 → lbkit-0.9.7}/lbkit/codegen/template/client.c.mako

@@ -322,7 +322,7 @@ static void __constructor(150) ${class_name}_register(void)
     _${class_name}_interface.signals = (LBSignal *)${intf.alias}_signals();
     ${method_processer} = ${intf.alias}_methods();
 
-    // 从公共库中复制属性信息
+    // 从公共库中复制属性信息。虽然生成了带sha值的xml文件，但注册接口时文件名不带sha，由lb_base在加载时自动兼容
     memcpy(&${properties}, ${intf.alias}_properties_const(), sizeof(${properties}));
     lb_interface_register(&_${class_name}_interface,
                            "${intf.introspect_xml_sha256}",

{lbkit-0.9.6 → lbkit-0.9.7}/lbkit/codegen/template/server.c.mako

@@ -432,7 +432,7 @@ static void __constructor(150) ${class_name}_register(void)
     _${class_name}_interface.methods = (LBMethod *)${class_name}_methods();
     _${class_name}_interface.signals = (LBSignal *)${class_name}_signals();
 
-    // 从公共库中复制属性信息
+    // 从公共库中复制属性信息。虽然生成了带sha值的xml文件，但注册接口时文件名不带sha，由lb_base在加载时自动兼容
     memcpy(&${properties}, ${class_name}_properties_const(), sizeof(${properties}));
     lb_interface_register(&_${class_name}_interface,
                            "${intf.introspect_xml_sha256}",

{lbkit-0.9.6 → lbkit-0.9.7/lbkit.egg-info}/PKG-INFO

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

lbkit-0.9.6/lbkit/__init__.py

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