lbkit 0.8.0__tar.gz → 0.8.1__tar.gz

{lbkit-0.8.0/lbkit.egg-info → lbkit-0.8.1}/PKG-INFO

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

lbkit-0.8.1/lbkit/__init__.py

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

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/client.c.mako

@@ -296,9 +296,14 @@ GSList *${class_name}_list(void)
 
 % for prop in intf.properties:
 /* 监听属性${prop.name}变更 */
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
+void ${class_name}_${prop.name}_hook(${class_name}_before_change_hook before, ${class_name}_after_changed_hook after, gpointer user_data)
 {
-    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+    LBPropertyHook hook = {
+        .before = (lbo_before_change_hook)before,
+        .after = (lbo_after_changed_hook)after,
+        .user_data = user_data
+    };
+    lb_impl._prop_hook(&${properties}.${prop.name}, &hook);
 }
 
 % endfor

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/client.h.mako

@@ -118,12 +118,6 @@ typedef void (*${class_name}_after_changed_hook)(${class_name} object, const LBP
 /* notes: 属性变更前回调，返回-1表示阻止值变更，一般用于值合法性校验，只在被远程操作时才会生效，本地变更值不会回调 */
 typedef gint (*${class_name}_before_change_hook)(${class_name} object, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
 
-/* 属性值变更回调钩子 */
-typedef struct {
-    ${class_name}_after_changed_hook after; /* 属性变更(写入对象数据区后)后回调函数 */
-    ${class_name}_before_change_hook before; /* 属性变更前回调函数，返回0后继续调用，返回非0时中止，所有before都成功时执行属性变更 */
-    gpointer user_data;
-} ${class_name}_property_hook;
 /* 查询对象 */
 ${class_name} ${class_name}_get(const gchar *well_known, const gchar *name);
 /* 创建对象 */
@@ -165,7 +159,8 @@ void ${class_name}_unlock(${class_name} obj);
 GSList *${class_name}_list(void);
 /* 监听属性 */
 % for prop in intf.properties:
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook);
+void ${class_name}_${prop.name}_hook(${class_name}_before_change_hook before, ${class_name}_after_changed_hook after,
+    gpointer user_data);
 % endfor
 
 static inline void ${class_name}_unref_p(${class_name} obj)

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/public.c.mako

@@ -962,9 +962,20 @@ const ${class_name}_Properties *${class_name}_properties_const(void)
 
 % for method in intf.fake_methods:
 % if not method.is_plugin:
+## 方法${method.name}的默认实现
+/* 方法${class_name}_${method.name}的默认实现 */
+__weak int ${class_name}_${method.name}(${class_name} object,
+    const ${class_name}_${method.name}_Req *req,
+    ${class_name}_${method.name}_Rsp **rsp,
+    GError **error, gpointer ext_data)
+{
+    *error = LbError_MethodNotImplament_new("${method.name}");
+    return -1;
+}
+
 ## 方法${method.name}的请求体序列化函数
 /* ${class_name}_${method.name}_Req请求结构体类型序列化（struct转GVariant）函数 */
-GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value)
+static GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value)
 {
     static ${class_name}_${method.name}_Req default_val;
     if (!value) {
@@ -985,7 +996,7 @@ GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_R
 
 ## 方法${method.name}的请求体反序列化函数
 /* ${class_name}_${method.name}_Req结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in)
+static ${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in)
 {
     GVariantIter iter;
     __attribute__((unused)) GVariant *tmp = NULL;
@@ -1005,11 +1016,11 @@ ${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVaria
     % endfor
     return output;
 }
-% endif
 
+% endif
 ## 方法${method.name}的请求体释放函数
 /* ${class_name}_${method.name}_Req结构体指针释放 */
-void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **value)
+static void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **value)
 {
     if (!value || !(*value)) {
         return;
@@ -1025,7 +1036,7 @@ void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **va
 
 % if not method.is_plugin:
 /* ${class_name}_${method.name}_Rsp请求结构体类型序列化（struct转GVariant）函数 */
-GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value)
+static GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value)
 {
     static ${class_name}_${method.name}_Rsp default_val;
     if (!value) {
@@ -1046,7 +1057,7 @@ GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_R
 
 ## 方法${method.name}的响应体反序列化函数
 /* ${class_name}_${method.name}_Rsp结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in)
+static ${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in)
 {
     GVariantIter iter;
     __attribute__((unused)) GVariant *tmp = NULL;
@@ -1066,8 +1077,8 @@ ${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVaria
     % endfor
     return output;
 }
-% endif
 
+% endif
 ## 方法${method.name}的响应体释放函数
 /* ${class_name}_${method.name}_Rsp结构体指针释放 */
 void ${class_name}_${method.name}_Rsp_free(${class_name}_${method.name}_Rsp **value)
@@ -1098,6 +1109,7 @@ static ${class_name}_Methods _${class_name}_methods =
         .rsp_decode = (lbo_message_decode_handler)${class_name}_${method.name}_Rsp_decode,
         .rsp_encode = (lbo_message_encode_handler)${class_name}_${method.name}_Rsp_encode,
         .rsp_free = (lbo_message_free_handler)${class_name}_${method.name}_Rsp_free,
+        .handler = ${class_name}_${method.name},
     },
 % endfor
     .__reserved__ = {
@@ -1217,7 +1229,7 @@ int ${class_name}_${action.name}_run(${class_name} object${REQ_PARA}${RSP_PARA})
 % for signal in intf.signals:
 ## 方法${method.name}的响应体序列化函数
 /* ${class_name}_${signal.name}_Msg请求结构体类型序列化（struct转GVariant）函数 */
-GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value)
+static GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value)
 {
     static ${class_name}_${signal.name}_Msg default_val;
     if (!value) {
@@ -1238,7 +1250,7 @@ GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_M
 
 ## 方法${signal.name}的响应体反序列化函数
 /* ${class_name}_${signal.name}_Msg结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in)
+static ${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in)
 {
     GVariantIter iter;
     __attribute__((unused)) GVariant *tmp = NULL;
@@ -1261,7 +1273,7 @@ ${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVaria
 
 ## 方法${signal.name}的响应体释放函数
 /* ${class_name}_${signal.name}_Msg结构体指针释放 */
-void ${class_name}_${signal.name}_Msg_free(${class_name}_${signal.name}_Msg **value)
+static void ${class_name}_${signal.name}_Msg_free(${class_name}_${signal.name}_Msg **value)
 {
     if (!value || !(*value)) {
         return;

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/public.h.mako

@@ -217,18 +217,12 @@ typedef struct {
         % endfor
 } ${class_name}_${method.name}_Rsp;
 
+void ${class_name}_${method.name}_Rsp_free(${class_name}_${method.name}_Rsp **value);
+
 % if not method.is_plugin:
-typedef int (*${class_name}_${method.name}_Method)(${class_name} object,
-    const ${class_name}_${method.name}_Req *req,
-    ${class_name}_${method.name}_Rsp **rsp,
-    GError **error, gpointer ext_data);
+int ${class_name}_${method.name}(${class_name} object, const ${class_name}_${method.name}_Req *req,
+    ${class_name}_${method.name}_Rsp **rsp, GError **error, gpointer ext_data);
 % endif
-GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value);
-${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in);
-void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **value);
-GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value);
-${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in);
-void ${class_name}_${method.name}_Rsp_free(${class_name}_${method.name}_Rsp **value);
 %endfor
 
 /* ${intf.name}的方法集合 */
@@ -244,7 +238,8 @@ typedef struct {
         lbo_message_decode_handler rsp_decode;
         lbo_message_encode_handler rsp_encode;
         lbo_message_free_handler rsp_free;
-        ${class_name}_${method.name}_Method handler;
+        int (*handler)(${class_name} object, const ${class_name}_${method.name}_Req *req,
+            ${class_name}_${method.name}_Rsp **rsp, GError **error, gpointer ext_data);
     } ${method.name};
 % endfor
     LBMethod __reserved__;
@@ -280,9 +275,6 @@ typedef struct {
             % endfor
         % endfor
 } ${class_name}_${signal.name}_Msg;
-${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in);
-GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value);
-void ${class_name}_${signal.name}_Msg_free(${class_name}_${signal.name}_Msg **value);
 
 %endfor
 typedef struct {

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/server.c.mako

@@ -585,9 +585,14 @@ GSList *${class_name}_list(void)
 
 % for prop in intf.properties:
 /* 监听属性${prop.name}变更 */
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
-{
-    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+void ${class_name}_${prop.name}_hook(${class_name}_before_change_hook before, ${class_name}_after_changed_hook after, gpointer user_data)
+{
+    LBPropertyHook hook = {
+        .before = (lbo_before_change_hook)before,
+        .after = (lbo_after_changed_hook)after,
+        .user_data = user_data
+    };
+    lb_impl._prop_hook(&${properties}.${prop.name}, &hook);
 }
 
 % endfor

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/codegen/template/server.h.mako

@@ -64,12 +64,6 @@ typedef void (*${class_name}_after_changed_hook)(${class_name} object, const LBP
 /* notes: 属性变更前回调，返回-1表示阻止值变更，一般用于值合法性校验，只在被远程操作时才会生效，本地变更值不会回调 */
 typedef gint (*${class_name}_before_change_hook)(${class_name} object, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
 
-/* 属性值变更回调钩子 */
-typedef struct {
-    ${class_name}_after_changed_hook after; /* 属性变更(写入对象数据区后)后回调函数 */
-    ${class_name}_before_change_hook before; /* 属性变更前回调函数，返回0后继续调用，返回非0时中止，所有before都成功时执行属性变更 */
-    gpointer user_data;
-} ${class_name}_property_hook;
 /* 查询对象 */
 ${class_name} ${class_name}_get(const gchar *name);
 /* 创建对象 */
@@ -114,7 +108,8 @@ void ${class_name}_unlock(${class_name} obj);
 GSList *${class_name}_list(void);
 /* 监听属性 */
 % for prop in intf.properties:
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook);
+void ${class_name}_${prop.name}_hook(${class_name}_before_change_hook before, ${class_name}_after_changed_hook after,
+    gpointer user_data);
 % endfor
 
 static inline void ${class_name}_unref_p(${class_name} obj)

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/integration/build_manifest.py

@@ -90,7 +90,7 @@ class BuildManifest(Task):
         fp.write(conanfile)
         fp.close()
 
-        self.exec("conan create . " + self.common_args)
+        self.exec("conan create . " + self.common_args, verbose=True)
 
     def build_litebmc(self):
         """构建产品conan包"""
@@ -112,11 +112,17 @@ class BuildManifest(Task):
         fp.close()
 
         base_cmd = f"{self.common_args} {self.conan_settings}"
-        lockfile = os.path.join(self.config.temp_path, "conan.lock")
         threadPool = ThreadPoolExecutor(max_workers=16)
+        if self.config.using_lockfile:
+            lockfile = os.path.join(self.config.code_path, "conan.lock")
+        else:
+            lockfile = os.path.join(self.config.temp_path, "conan.lock")
         # 创建新的conan.lock文件
-        lock_cmd = f"conan lock create . {base_cmd} --lockfile-out={lockfile}"
-        self.exec(lock_cmd)
+        if not self.config.using_lockfile or self.config.update_lockfile:
+            lock_cmd = f"conan lock create . {base_cmd} --lockfile-out={lockfile}"
+            self.exec(lock_cmd, verbose=True)
+        if not os.path.isfile(lockfile):
+            raise FileNotFoundError("lockfile ./conan.lock was not found")
         with open(lockfile, "r") as fp:
             lock = json.load(fp)
         for key in ["requires", "build_requires", "python_requires", "config_requires"]:

{lbkit-0.8.0 → lbkit-0.8.1}/lbkit/integration/config.py

@@ -35,6 +35,10 @@ class Config(object):
         # 编译目标配置项
         self.profile_host = args.profile
 
+        # conan.lock options
+        self.using_lockfile = args.lockfile
+        self.update_lockfile = args.update_lockfile
+
         # 设置并创建构建所需目录
         log.info("Work dir: %s", self.work_dir)
         self.code_path = os.getcwd()
@@ -59,12 +63,14 @@ class Config(object):
     def arg_parser():
         """返回配置项支持的参数"""
         parser = argparse.ArgumentParser(description="Build LiteBMC")
-        parser.add_argument("-m", "--manifest", help="Specify the manifest.yml ", default="./manifest.yml")
+        parser.add_argument("-m", "--manifest", help="Specify the manifest.yml, ignored when -l is specified.", default="./manifest.yml")
         parser.add_argument("-s", "--from_source", help="Build from source", action="store_true")
         parser.add_argument("-pr", "--profile", help="Apply the specified profile to the host machine", default="litebmc.ini")
         parser.add_argument("-pr:b", "--profile_build", help="Apply the specified profile to the build machine", default="default")
         parser.add_argument("-t", "--build_type", type=str, choices=['debug', 'release', 'minsize'], help="Set the build type", default="debug")
         parser.add_argument("-r", "--remote", help="specified conan server", default="litebmc")
+        parser.add_argument("-l", "--lockfile", help="using conan.lock", action="store_true")
+        parser.add_argument("-ul", "--update_lockfile", help="update conan.lock", action="store_true")
         return parser
 
     def get_manifest_config(self, key: str, default=None):

{lbkit-0.8.0 → lbkit-0.8.1/lbkit.egg-info}/PKG-INFO

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

lbkit-0.8.0/lbkit/__init__.py

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