lbkit 0.5.13__tar.gz → 0.5.14__tar.gz

{lbkit-0.5.13/lbkit.egg-info → lbkit-0.5.14}/PKG-INFO

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

lbkit-0.5.14/lbkit/__init__.py

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

{lbkit-0.5.13 → lbkit-0.5.14}/lbkit/component/template/conanbase.mako

@@ -123,18 +123,19 @@ class LiteBmcConan(ConanFile):
             % endfor
         % endif
     % endfor
+        if self.options.test == True:
 <%test_requires=pkg["requires"].get("test", [])%>\
     % if len(test_requires):
         % for conan in test_requires:
             % if conan.get("option") is not None:
                 % for k, v in conan.get("option").items():
-        self.options["${conan.get("conan").split("/")[0]}"].${k} = ${("\"" + v + "\"") if isinstance(v, str) else str(v)}
+            self.options["${conan.get("conan").split("/")[0]}"].${k} = ${("\"" + v + "\"") if isinstance(v, str) else str(v)}
                 % endfor
             % endif
         % endfor
     % endif
 % endif
-        pass
+            pass
 
     def _append_default_flags(self):
         flags = []

{lbkit-0.5.13 → lbkit-0.5.14}/lbkit/component/template/deploy.mako

@@ -11,6 +11,27 @@ class DeployConan(ConanFile):
     package_type = "application"
     version = "0.0.1"
     license = "MulanPSL v2"
+    options = {
+        "gcov": [False, True],
+        "test": [False, True],
+% if len(pkg.get("options", [])) > 0:
+    % for op, ctx in pkg["options"].items():
+        "${op}": [${", ".join(("\"" + i + "\"") if isinstance(i, str) else str(i) for i in ctx["option"])}],
+    % endfor
+% endif
+    }
+    default_options = {
+% if pkg_type == "library":
+        "shared": True,
+% endif
+        "gcov": False,
+        "test": False,
+% if len(pkg.get("options", [])) > 0:
+    % for op, ctx in pkg["options"].items():
+        "${op}": ${("\"" + ctx["default"] + "\"") if isinstance(ctx["default"], str) else str(ctx["default"])},
+    % endfor
+% endif
+    }
 
     def requirements(self):
     % for package in packages:
@@ -27,16 +48,16 @@ class DeployConan(ConanFile):
             % endfor
         % endif
     % endfor
+        if self.options.test == True:
 <%test_requires=pkg["requires"].get("test", [])%>\
     % if len(test_requires):
         % for conan in test_requires:
             % if conan.get("option") is not None:
                 % for k, v in conan.get("option").items():
-        self.options["${conan.get("conan").split("/")[0]}"].${k} = ${("\"" + v + "\"") if isinstance(v, str) else str(v)}
+            self.options["${conan.get("conan").split("/")[0]}"].${k} = ${("\"" + v + "\"") if isinstance(v, str) else str(v)}
                 % endfor
             % endif
         % endfor
     % endif
 % endif
-        pass
-
+            pass

{lbkit-0.5.13 → lbkit-0.5.14}/lbkit/integration/build_manifest.py

@@ -29,6 +29,7 @@ class BuildManifest(Task):
             self.conan_settings = " -s build_type=Release"
         self.common_args = "-r " + self.config.remote
         self.common_args += " -pr:b {} -pr:h {}".format(self.config.profile_build, self.config.profile_host)
+        self.common_args += " -o */*:test=False"
 
     def deploy(self):
         cmd = f"conan graph info . {self.common_args} --build=missing -f json --filter=ref --filter=package_id"

{lbkit-0.5.13 → lbkit-0.5.14/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.13/lbkit/__init__.py

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