openubmc-bingo 0.6.4__py3-none-any.whl → 0.6.7__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.4'
+__version__ = '0.6.7'

bmcgo/cli/cli.py

@@ -24,6 +24,7 @@ from importlib.util import spec_from_file_location, module_from_spec
 
 import yaml
 from colorama import Fore, Style
+from conan import conan_version
 
 from bmcgo import __version__ as client_version
 from bmcgo.component.build import BuildComp
@@ -142,7 +143,7 @@ class Command(object):
         try:
             commands = self._commands(False)
             method = commands[args.command]
-            self._warn_python_version()
+            self._warn_dependencies_version()
             method(["--help"])
         except KeyError as exp:
             log.debug("Exception: %s", str(exp))
@@ -241,7 +242,7 @@ class Command(object):
         """HIDDEN: entry point for executing commands, dispatcher to class
         methods
         """
-        if not self._check_conan():
+        if not self._check_conan() or not self._check_conan_profile():
             return 1
         try:
             command = args[0][0]
@@ -253,7 +254,7 @@ class Command(object):
                 self.show_version()
                 return 0
 
-            self._warn_python_version()
+            self._warn_dependencies_version()
 
             if command in ["-h", "--help"]:
                 self._show_help()
@@ -309,6 +310,17 @@ class Command(object):
         if studio_version:
             log.info("bmc-studio 版本为: %s", studio_version)
 
+    def _check_conan_profile(self):
+        profile_dir = os.path.join(tools.conan_home, "profiles")
+        if os.path.isdir(profile_dir):
+            return True
+
+        if misc.conan_v2():
+            log.warning("检测到依赖conan2.0但未正确初始化，请切换到产品仓执行一次构建，以安装和配置工具链")
+        else:
+            log.warning("检测到依赖conan1.0但未正确初始化，请切换到产品仓执行一次构建，以安装和配置工具链")
+        return False
+
     def _check_conan(self):
         need_conan_v2 = False
         conf = None
@@ -323,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:
@@ -348,7 +361,7 @@ class Command(object):
             log.info("    [conan]")
             log.info("    version = 2.x.x")
             log.info("3. conan_index仓使用参数`--conan2`控制是否构建conan2.0包（conan2.0包配方存储在recipes2目录）")
-            tools.run_command("pip3 install conan==2.13.0 --force-reinstall --break-system-packages")
+            tools.run_command("pip3 install conan==2.13.0 --break-system-packages")
             log.warning("检测到依赖conan2.0但仅安装了conan1.0，已安装conan2.0，任务退出，请重新执行")
             return False
         if not need_conan_v2 and misc.conan_v2():
@@ -356,7 +369,7 @@ class Command(object):
             log.info("1. 组件仓支持conan1.0的依据：conanfile.py中未申明`required_conan_version`或依赖conan 1.x.x")
             log.info("2. manifest或ibmc_sdk仓支持conan1.0的依据：.bmcgo/config或.bingo/config文件未记录的conan.version配置")
             log.info("3. conan_index仓默认（不指定`--conan2`时）构建conan1.0包（conan1.0包配方存储在recipes目录）")
-            tools.run_command("pip3 install conan==1.62.0 --force-reinstall --break-system-packages")
+            tools.run_command("pip3 install conan==1.62.0 --break-system-packages")
             log.warning("检测到依赖conan1.0但仅安装了conan2.0，已安装conan1.0，任务退出，请重新执行")
             return False
         return True
@@ -561,12 +574,14 @@ class Command(object):
                     result[method_name] = method
         return result
 
-    def _warn_python_version(self):
+    def _warn_dependencies_version(self):
         width = 70
         version = sys.version_info
         if version.major < 3:
             log.info("%s\n 不在提供 Python 2支持. 强烈推荐使用 Python >= 3.0\n", "*" * width)
 
+        log.info("conan版本: " + str(conan_version))
+
     def _show_help_data(self, cmd_name, help_lines):
         log.info("%s%s", cmd_name, help_lines[0])
         for help_line in help_lines[1:]:

bmcgo/cli/config.conan2.yaml

@@ -3,7 +3,7 @@ comp_type:
   - component
   - manifest
 dt_dependencies:
-  dtframeforlua: dtframeforlua/0.0.24+conan2@openubmc/stable
-  luaunit: luaunit/3.2+conan2@openubmc/stable
-  luacov: luacov/0.16.3+conan2@openubmc/stable
-  luafilesystem: luafilesystem/1.8.0.b022+conan2@openubmc/stable
+  dtframeforlua: dtframeforlua/0.0.24@openubmc/stable
+  luaunit: luaunit/3.2@openubmc/stable
+  luacov: luacov/0.16.3@openubmc/stable
+  luafilesystem: luafilesystem/1.8.0.b022@openubmc/stable

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)

bmcgo/functional/conan_index_build.py

@@ -276,11 +276,14 @@ class BmcgoCommand:
         if self.path == "" or self.version == "":
             raise errors.BmcGoException(f"Path({self.path}) or version({self.version}) error")
 
+        if not self.check_conan(self.conan2):
+            return -1
         os.chdir(self.path)
         if misc.conan_v1():
             self.run_v1()
         else:
             self.run_v2()
+        return 0
 
     def tag_check(self):
         yaml_file = f"{self.path}/conandata.yml"
@@ -300,3 +303,18 @@ class BmcgoCommand:
                 tag_list.append({"tag": value['branch'], "url": value['url']})
         # 这里的 git 命令的意思是检查远端是否有此 tag, 如果不加 grep, 可能导致分支被认为是 tag
         Function.git_check(tag_list)
+
+    def check_conan(self, need_conan_v2):
+        if need_conan_v2 and misc.conan_v1():
+            log.warning("检测到依赖conan2.0但仅安装了conan1.0，尝试重新安装conan2.0")
+            log.info("  conan_index仓使用参数`--conan2`控制是否构建conan2.0包（conan2.0包配方存储在recipes2目录）")
+            self.run_command("pip3 install conan==2.13.0 --break-system-packages")
+            log.warning("检测到依赖conan2.0但仅安装了conan1.0，已安装conan2.0，任务退出，请重新执行")
+            return False
+        if not need_conan_v2 and misc.conan_v2():
+            log.warning("检测到依赖conan1.0但仅安装了conan2.0，尝试重新安装conan1.0")
+            log.info("  conan_index仓默认（不指定`--conan2`时）构建conan1.0包（conan1.0包配方存储在recipes目录）")
+            self.run_command("pip3 install conan==1.62.0 --break-system-packages")
+            log.warning("检测到依赖conan1.0但仅安装了conan2.0，已安装conan1.0，任务退出，请重新执行")
+            return False
+        return True

{openubmc_bingo-0.6.4.dist-info → openubmc_bingo-0.6.7.dist-info}/METADATA

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

{openubmc_bingo-0.6.4.dist-info → openubmc_bingo-0.6.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=7OSOYpUQ0NY7GUc3SFVRUUwKeUdmKU6vctC_40Pu0FY,561
+bmcgo/__init__.py,sha256=1tsWug6hVxYeVnfDiz-kIdLcf8bphjLcfRl0l-F-TTM,561
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -7,8 +7,8 @@ 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=KiQlFonVx0G7pZkETLKoWAPIZAOBgZgM1YRfeIUbhog,24938
-bmcgo/cli/config.conan2.yaml,sha256=jB0u2jSPpEk6D1-I3xQKnDinnLHVoRV9Z0CA583dotg,289
+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
 bmcgo/codegen/c/__init__.py,sha256=tmBG8c6sfxgIj__lyyU5mydWeKBdqbDuIQkLI38lwjI,522
@@ -168,7 +168,7 @@ 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=4cusLnULxD42DhIICDdtB-W8wbBBt0CeOhZinRW04I4,12812
 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
@@ -196,7 +196,7 @@ bmcgo/functional/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,
 bmcgo/functional/analysis.py,sha256=pXakxSojBH-dULngbmgMHR3bq9tphOaAN4euGKgEYoc,4016
 bmcgo/functional/bmc_studio_action.py,sha256=Gg96UB8QtnhsaqSdMhXuS9fddzAFPhR6UYCpto9UOYA,3605
 bmcgo/functional/check.py,sha256=ReGN_8RRM6isX_r7XXEuHzkooh8pasky5_GpAml5d_g,8356
-bmcgo/functional/conan_index_build.py,sha256=wQdrXA_ItIN0pO7If-21HyQftJsR76oahX-h4BBgQs4,12249
+bmcgo/functional/conan_index_build.py,sha256=Mp1fDpZVvecn5lUCsWZqq3mKSx9yu5pznQrDZr4Liuk,13443
 bmcgo/functional/config.py,sha256=ZQ-a9hegI0cV41iTo7t49ryBeUH4wPJ-qkVvWp8toV4,10824
 bmcgo/functional/csr_build.py,sha256=JTIvbjn08xvdo7aUhKW4giwPayojyIeQolT14SuwJRo,41146
 bmcgo/functional/deploy.py,sha256=2NsxCpoZjL4jTyRpbIp20-EKKbQkQe-Hsm20uxHK2Xc,10677
@@ -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.4.dist-info/METADATA,sha256=n6m9OgHl9xfiLJpIRwLZzi78ZmQWUT0AL8cK1vWBz0M,1009
-openubmc_bingo-0.6.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.4.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.4.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.4.dist-info/RECORD,,
+openubmc_bingo-0.6.7.dist-info/METADATA,sha256=yseh5MfSjqLah79NzBBPaBXuJrseP6e6H62K1XH4oCA,1009
+openubmc_bingo-0.6.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.7.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.7.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.7.dist-info/RECORD,,