lbkit 0.6.4__tar.gz → 0.6.5__tar.gz

{lbkit-0.6.4/lbkit.egg-info → lbkit-0.6.5}/PKG-INFO

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

lbkit-0.6.5/lbkit/__init__.py

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

{lbkit-0.6.4 → lbkit-0.6.5}/lbkit/codegen/template/client.c.mako

@@ -1,7 +1,4 @@
 #include "lb_base.h"
-% for dep_intf in intf.dependency_interface:
-#include "public/${dep_intf}.h"
-% endfor
 #include "${intf.name}.h"
 
 <% class_name = intf.alias + "_Cli"

{lbkit-0.6.4 → lbkit-0.6.5}/lbkit/codegen/template/public.c.mako

@@ -1,7 +1,4 @@
 #include "lb_base.h"
-% for dep_intf in intf.dependency_interface:
-#include "public/${dep_intf}.h"
-% endfor
 #include "${intf.name}.h"
 
 <% class_name = intf.alias %>\
@@ -1034,12 +1031,12 @@ int ${class_name}_${action.name}_register(const gchar *req_signature, const gcha
     }
     if (g_strcmp0(req_signature, "${action.in_signature}") != 0) {
         log_error("Register ${action.name} failed because parameter "
-            "req_signature not match with \"{action.in_signature}\", get \"%s\"", req_signature);
+            "req_signature not match with \"${action.in_signature}\", get \"%s\"", req_signature);
         return -1;
     }
     if (g_strcmp0(rsp_signature, "${action.out_signature}") != 0) {
         log_error("Register ${action.name} failed because parameter "
-            "rsp_signature not match with \"{action.out_signature}\", get \"%s\"", rsp_signature);
+            "rsp_signature not match with \"${action.out_signature}\", get \"%s\"", rsp_signature);
         return -1;
     }
     g_mutex_lock(&_${class_name}_${action.name}_lock);

{lbkit-0.6.4 → lbkit-0.6.5}/lbkit/codegen/template/public.h.mako

@@ -4,6 +4,9 @@
 #include <glib-2.0/glib.h>
 #include <glib-2.0/gio/gio.h>
 #include "lb_base.h"
+% for dep_intf in intf.dependency_interface:
+#include "public/${dep_intf}.h"
+% endfor
 
 #ifdef __cplusplus
 extern "C" {

{lbkit-0.6.4 → lbkit-0.6.5}/lbkit/codegen/template/server.c.mako

@@ -1,8 +1,5 @@
 <% from lbkit.codegen.ctype_defination import StringValidator %>\
 #include "lb_base.h"
-% for dep_intf in intf.dependency_interface:
-#include "public/${dep_intf}.h"
-% endfor
 #include "${intf.name}.h"
 
 <%

{lbkit-0.6.4 → lbkit-0.6.5}/lbkit/component/template/conanbase.mako

@@ -127,6 +127,19 @@ class LiteBmcConan(ConanFile):
 % endif
         pass
 
+% if len(pkg.get("requires", {})) > 0:
+    def build_requirements(self):
+    % for conan in pkg["requires"].get("tool", []):
+        % if conan.get("when") is not None:
+        if ${conan.get("when")}:
+            self.tool_requires("${conan.get("conan")}")
+        % else:
+        self.tool_requires("${conan.get("conan")}")
+        % endif
+    % endfor
+        pass
+% endif
+
     def configure(self):
 % if len(pkg.get("requires", {})) > 0:
     % for conan in pkg["requires"].get("compile", []):

{lbkit-0.6.4 → lbkit-0.6.5/lbkit.egg-info}/PKG-INFO

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

lbkit-0.6.4/lbkit/__init__.py

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