lbkit 0.5.16__tar.gz → 0.5.17__tar.gz

{lbkit-0.5.16/lbkit.egg-info → lbkit-0.5.17}/PKG-INFO

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

lbkit-0.5.17/lbkit/__init__.py

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

{lbkit-0.5.16 → lbkit-0.5.17}/lbkit/codegen/idf_interface.py

@@ -39,14 +39,14 @@ class IdfAnnotation():
         else:
             raise IDFException(f"the value of {name} with type error, must be a string or bool, but real type is {type(value)}")
 
-            #   "pattern": "^(readwrite|readonly|writeonly|deprecated|private|emits_changes|emits_invalidates|refval|refobj)(,(readwrite|readonly|writeonly|deprecated|private|emits_changes|emits_invalidates|refobj|refval))*$"
+            #   "pattern": "^(readwrite|readonly|writeonly|deprecated|hidden|emits_change|emits_invalidation|refval|refobj)(,(readwrite|readonly|writeonly|deprecated|hidden|emits_change|emits_invalidation|refobj|refval))*$"
 ANNOTATION_MAP = {
     "deprecated": IdfAnnotation("org.freedesktop.DBus.Deprecated", "true"),
-    "emits_changes": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "true"),
-    "emits_invalidates": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "invalidates"),
-    "emits_const": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "const"),
+    "emits_change": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "true"),
+    "emits_invalidation": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "invalidates"),
+    "const": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "const"),
     "emits_false": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "false"),
-    "private": IdfAnnotation("com.litebmc.Dbus.Property.Private", "const"),
+    "hidden": IdfAnnotation("com.litebmc.Dbus.Property.Private", "const"),
     "refobj": IdfAnnotation("com.litebmc.Dbus.Property.RefObject", "true"),
     "required": IdfAnnotation("com.litebmc.Dbus.Property.Required", "true"),
 }
@@ -511,7 +511,7 @@ class IdfProperty(IdfCtypeRender):
         self.description = prop_data.get("description", "")
         flags = prop_data.get("flags", "").split(",")
         self.flags = flags
-        self.private = True if ("private" in flags) else False
+        self.private = True if ("hidden" in flags) else False
         self.deprecated = True if ("deprecated" in flags) else False
         # refobj的ctype只能是s或as
         if "refobj" in flags and self.ctype != "string" and self.ctype != "array[string]":
@@ -528,11 +528,11 @@ class IdfProperty(IdfCtypeRender):
         c_flags = []
         if self.private:
             c_flags.append("PM_FLAGS_PROPERTY_PRIVATE")
-        elif "emits_const" in flags:
+        elif "const" in flags:
             c_flags.append("PM_FLAGS_PROPERTY_EMIT_CONST")
         elif "emits_false" in flags:
             c_flags.append("PM_FLAGS_PROPERTY_EMIT_FALSE")
-        elif "emits_invalidates" in flags:
+        elif "emits_invalidation" in flags:
             c_flags.append("PM_FLAGS_PROPERTY_EMIT_INVALIDATES")
         else:
             c_flags.append("PM_FLAGS_PROPERTY_EMIT_TRUE")

{lbkit-0.5.16 → lbkit-0.5.17}/lbkit/component/build.py

@@ -59,7 +59,6 @@ class BuildComponent():
         self.build_type = self.options.build_type
         self.profile = self.options.profile
         self.profile_build = self.options.profile_build
-        self.runtime_packages = []
         self.verbose = False if self.options.summary else True
         self.from_source = self.options.from_source
         # 当前组件及其依赖将被部署到rootfs目录
@@ -134,14 +133,8 @@ class BuildComponent():
             if self.options.test:
                 for rt in requires.get("test", []):
                     deps.append(rt)
-                    conan = rt.get("conan")
-                    if conan is not None:
-                        self.runtime_packages.append(conan)
             for rt in requires.get("compile", []):
                 deps.append(rt)
-                conan = rt.get("conan")
-                if conan is not None:
-                    self.runtime_packages.append(conan)
 
         for dep in deps:
             option = dep.get("option", {})
@@ -179,7 +172,7 @@ class BuildComponent():
         # 生成部署deploy命令
         lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
         template = lookup.get_template("deploy.mako")
-        deploy = template.render(lookup=lookup, pkg=self.pkg, packages=self.runtime_packages)
+        deploy = template.render(lookup=lookup, pkg=self.pkg, packages=[])
         dir = os.path.join(cwd, ".temp", "deploy")
         # 创建临时目录并写入conanfile.py文件
         os.makedirs(dir, exist_ok=True)
@@ -191,6 +184,11 @@ class BuildComponent():
 
         cmd = self.base_cmd.replace(self.package, "")
         cmd = f"conan create . {cmd} --build=missing -tf=\"\""
+        if self.options.test:
+            cmd += " -o deploy/*:test=True"
+        for pkg_option in self.options.pkg_options:
+            if not pkg_option.startswith(self.name + "/"):
+                cmd += " -o " + pkg_option
         tools.exec(cmd, verbose=True)
         os.chdir(cwd)
 
@@ -203,9 +201,7 @@ class BuildComponent():
         # 生成部署deploy命令
         lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
         template = lookup.get_template("deploy.mako")
-        packages = self.runtime_packages
-        packages.append(self.package)
-        deploy = template.render(lookup=lookup, pkg=self.pkg, packages=packages)
+        deploy = template.render(lookup=lookup, pkg=self.pkg, packages=[self.package])
         dir = os.path.join(cwd, ".temp", "deploy")
         # 创建临时目录并写入conanfile.py文件
         os.makedirs(dir, exist_ok=True)
@@ -217,6 +213,10 @@ class BuildComponent():
 
         cmd = self.base_cmd.replace(self.package, "")
         cmd = f"conan graph info . {cmd} --build=missing -f json --filter=ref --filter=package_id --filter=context"
+        if self.options.test:
+            cmd += " -o deploy/*:test=True"
+        for pkg_option in self.options.pkg_options:
+            cmd += " -o " + pkg_option
         res = tools.run(cmd).stdout.strip()
         graph = json.loads(res)
         nodes = graph.get("graph", {}).get("nodes", {})

{lbkit-0.5.16 → lbkit-0.5.17}/lbkit/component/template/deploy.mako

@@ -34,9 +34,31 @@ class DeployConan(ConanFile):
     }
 
     def requirements(self):
-    % for package in packages:
+% for package in packages:
         self.requires("${package}")
+% endfor
+% if len(pkg.get("requires", {})) > 0:
+    % for conan in pkg["requires"].get("compile", []):
+        % if conan.get("when") is not None:
+        if ${conan.get("when")}:
+            self.requires("${conan.get("conan")}")
+        % else:
+        self.requires("${conan.get("conan")}")
+        % endif
     % endfor
+<%test_requires=pkg["requires"].get("test", [])%>\
+    % if len(test_requires):
+        if self.options.test == True:
+        % for conan in test_requires:
+            % if conan.get("when") is not None:
+            if ${conan.get("when")}:
+                self.requires("${conan.get("conan")}")
+            % else:
+            self.requires("${conan.get("conan")}")
+            % endif
+        % endfor
+    % endif
+% endif
         pass
 
     def configure(self):

{lbkit-0.5.16 → lbkit-0.5.17/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.16/lbkit/__init__.py

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