openubmc-bingo 0.6.5__py3-none-any.whl → 0.6.9__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.5'
+__version__ = '0.6.9'

bmcgo/cli/cli.py

@@ -335,10 +335,11 @@ class Command(object):
             for line in lines:
                 if not line.startswith("required_conan_version"):
                     continue
-                match = re.search("([0-9]+\\.[0-9]+\\.[0-9]+)", line)
+                match = re.search("\"(.*)\"", line)
                 if not match:
                     continue
-                if match[0].startswith("2."):
+                import semver
+                if semver.satisfies("2.13.0", match[1]):
                     need_conan_v2 = True
                     break
         else:

bmcgo/component/build.py

@@ -57,10 +57,6 @@ class BuildComp():
 
     @staticmethod
     def check_luac():
-        luac_path = os.path.join(os.path.expanduser('~'), ".conan", "bin", "luac")
-        if not os.path.isfile(luac_path):
-            raise BmcGoException(f"当前环境中未安装luac！请更新manifest仓代码，执行环境初始化脚本init.py重新部署环境！")
-
         conan_bin = os.path.join(os.path.expanduser('~'), ".conan", "bin")
         # 设置PLD_LIBRARY_PATH环境变量，luajit运行时需要加载so动态库
         ld_library_path = conan_bin + ":" + os.environ.get("LD_LIBRARY_PATH", "")
@@ -69,6 +65,43 @@ class BuildComp():
         path = conan_bin + ":" + os.environ.get("PATH", "")
         os.environ["PATH"] = path
         os.environ["LUA_PATH"] = f"{conan_bin}/?.lua"
+    
+    def install_luac(self):
+        self.check_luac()
+        if self.bconfig.partner_mode:
+            return
+        conan_bin = os.path.join(os.path.expanduser('~'), ".conan", "bin")
+        luac_path = os.path.join(conan_bin, "luac")
+        skynet_pkg = "skynet/1.7.0.B002@hw.ibmc.release/stable"
+        skynet_flag = skynet_pkg.split("@")[0].replace("/", "_")
+        skynet_flag = os.path.join(conan_bin, skynet_flag)
+
+        options = ""
+        if self.info.enable_luajit:
+            luac_path = os.path.join(conan_bin, "luajit")
+            options = "-0 skynet:enable_luajit=True"
+            skynet_flag += "_luajit"
+        else:
+            skynet_flag += "luac"
+        if os.path.isfile(skynet_flag) and os.path.exists(luac_path):
+            os.chmod(luac_path, stat.S_IRWXU)
+            return
+        if os.path.isdir(conan_bin):
+            shutil.rmtree(conan_bin)
+        os.makedirs(conan_bin)
+        cmd = [misc.CONAN, "install", skynet_pkg, "-pr", "profile.dt.ini", "--build", "-u"]
+        cmd += options.split()
+        if self.info.remote:
+            cmd += ["-r", self.info.remote]
+        Helper.run(cmd)
+        os.chmod(luac_path, stat.S_IRWXU)
+        if self.info.enable_luajit:
+            luajit2luac = shutil.which("luajit2luac.sh")
+            cmd = ["cp", luajit2luac, f"{conan_bin}/luac"]
+            Helper.run(cmd)
+        import pathlib
+        pathlib.Path(skynet_flag).touch(exist_ok=True)
+        
 
     def gen_conanbase(self, gen_conanbase, service_json):
         if misc.conan_v1():
@@ -208,7 +241,7 @@ class BuildComp():
     def run_conan_v1(self):
         tool.clean_locks()
         self.check_conan_profile()
-        self.check_luac()
+        self.install_luac()
         from_source = "--build=missing"
         if self.info.from_source:
             from_source = "--build"
@@ -238,7 +271,7 @@ class BuildComp():
         if self.info.no_cache:
             args += " -u"
         cmd = [misc.CONAN, "create", "--name", self.info.name, "--version", self.info.version]
-        args += f" -f json --out-file={self.graph_file.name}"
+        args += f" -f json --out-file={self.graph_file.name} -tf="
         cmd += args.split()
         tool.run_command(cmd, show_log=True)
         package_folder = tool.get_package_folder_from_graph_file(self.graph_file.name, self.info.package)
@@ -256,6 +289,7 @@ class BuildComp():
         if os.path.isdir("test_package"):
             cmd = [misc.CONAN, "create"]
             cmd += self.info.cmd_base.split()
+            cmd += ["--build=missing"]
             cmd += ["-tf", "test_package"]
             Helper.run(cmd)
 

bmcgo/component/test.py

@@ -412,7 +412,7 @@ class TestComp():
         if return_code == 0:
             log.info(f"添加luacov 依赖到 {self.preloader}")
             insert_str = "require 'luacov'"
-            self.tools.run_command(f"sed -i \"1i {insert_str}\" {self.test_config}")
+            self.tools.run_command(f"sed -i \"1i {insert_str}\" {self.preloader}")
             return
 
         preloader_dir = os.path.dirname(self.preloader)

{openubmc_bingo-0.6.5.dist-info → openubmc_bingo-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.5
+Version: 0.6.9
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.5.dist-info → openubmc_bingo-0.6.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=HkfuO_PI6boJ1j3oBGA-nQzCHEsgrvMlV-5XC_wnMGg,561
+bmcgo/__init__.py,sha256=H1vNju-JkVTTHzbQe3YxQWPLnjMc71rbXm0aiozfv0M,561
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -7,7 +7,7 @@ bmcgo/logger.py,sha256=rcMqJnyQ5Ag3k04KLEskrG8ZJ508OOU_JH4fMFiGOqQ,6644
 bmcgo/misc.py,sha256=w0vzsD7uzrsxTly5Y1viLgYTKHhLP4sxa499XwbqHnU,6986
 bmcgo/worker.py,sha256=OXz5Gam3pmZjgQeoGJrYy73ZrQszCOxk9X19nbeBI_A,15710
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=92xIehLCq8g0WOb5myU7Tr8uSeq1NbwOAngdyz_tuVc,25560
+bmcgo/cli/cli.py,sha256=kuNrwKpg5Zbi9TG0jhlObkAJ3xJtj35sBIh-q2bmlyU,25583
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -168,13 +168,13 @@ bmcgo/codegen/lua/v1/templates/apps/service.lua.mako,sha256=wd_NJtiSSMbR-lxEqv-r
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako,sha256=msdj2SygZvV3RIEHLeVDfZvOzZ99Yy27SwPVrFVVcpc,1242
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_obj.lua.mako,sha256=oCzx2u3bjvCdNKX5oC8j6Q-Zb21q6SFCqd14_VzrWvo,349
 bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/component/build.py,sha256=gomdHTfscI4p_m2sev2vR9ws55N7ZyuMPNPGv126u9U,11630
+bmcgo/component/build.py,sha256=7ZYTxVOVO6T1caP3KCmyJ8yWE992g8gc6yU2f-bZx5s,12851
 bmcgo/component/component_dt_version_parse.py,sha256=-Rt6i2fZrmYNZGoMqB21D_T9fC7fhhtUFIFvdPsMICM,14188
 bmcgo/component/component_helper.py,sha256=rNwfhagfz6E3BjKERq9oOPLRfeKQlqhLojb6oJLXcEA,7933
 bmcgo/component/deploy.py,sha256=Iy5CsiolKS1h5jDg13nYkfy6--BtbBZ8FLou2oVuoLQ,6544
 bmcgo/component/gen.py,sha256=lhPe_VV08CDFSydSLCX7IC5m8obNvYZSSzIp9o84nd0,7248
 bmcgo/component/package_info.py,sha256=5iOcS9gFnwBQo3uNivVjgeJw_xP3RDnnBA7nxjOc2vs,14472
-bmcgo/component/test.py,sha256=t_j0K_r5OrZ4T_2io8Kk53xYf0M6bD5yextANttaRKU,45373
+bmcgo/component/test.py,sha256=kNfqBSiBoZDQoyFjymIEJt9ohXi3_2rELsvyxCzpLNk,45371
 bmcgo/component/analysis/analysis.py,sha256=VJpKdvQmlFQaeKWl3-JggsPq4ioObKOXuaBfzgd74hQ,8497
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
 bmcgo/component/analysis/data_deps.py,sha256=UkuqMhJseZIXMZWC2cJ4csko7rENPlpXJUU0eRWVZNM,16148
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.5.dist-info/METADATA,sha256=QqHsIpyNgwy7-mIC-MFArF_7S1ccv37wcHuhO7jbyng,1009
-openubmc_bingo-0.6.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.5.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.5.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.5.dist-info/RECORD,,
+openubmc_bingo-0.6.9.dist-info/METADATA,sha256=dR-Pnq-u-cJmQ3sYwM3AI0-v7cLHM2Z6qZxDk9oIY-o,1009
+openubmc_bingo-0.6.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.9.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.9.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.9.dist-info/RECORD,,