openubmc-bingo 0.5.277__py3-none-any.whl → 0.6.2__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.5.277'
+__version__ = '0.6.2'

bmcgo/bmcgo_config.py

@@ -36,16 +36,12 @@ class BmcgoComp(object):
         self.config = config
 
 
-class BmcgoConanIndex(object):
-    def __init__(self, folder, config: configparser.ConfigParser):
-        self.folder = os.path.realpath(folder)
-        self.config = config
+class BmcgoConanIndex(BmcgoComp):
+    pass
 
 
-class BmcgoManifest(object):
-    def __init__(self, folder, config: configparser.ConfigParser):
-        self.folder = os.path.realpath(folder)
-        self.config = config
+class BmcgoManifest(BmcgoComp):
+    pass
 
 
 class BmcgoHpmServerSign(object):
@@ -115,13 +111,26 @@ class BmcgoConfig(object):
         self.bmcgo_local_config = configparser.ConfigParser()
         self.bmcgo_config_list = {}
         self._bmcgo_config_load()
-        self.conf_path = os.path.join(self.bmcgo_path, "cli", "config.yaml")
+        if misc.conan_v1():
+            self.conf_path = os.path.join(self.bmcgo_path, "cli", "config.yaml")
+        else:
+            self.conf_path = os.path.join(self.bmcgo_path, "cli", "config.conan2.yaml")
 
     @functools.cached_property
     def partner_mode(self):
         """是否是伙伴模式"""
         """勿删除,用于构建伙伴模式bmcgo,return True"""
-        return True
+        community = (misc.community_name() == "openubmc")
+        if community:
+            return True
+        if not os.path.isfile(misc.GLOBAL_CFG_FILE):
+            return False
+        conf = configparser.ConfigParser()
+        conf.read(misc.GLOBAL_CFG_FILE)
+        try:
+            return conf.getboolean("partner", "enable")
+        except (NoSectionError, NoOptionError):
+            return False
 
     @functools.cached_property
     def current_branch(self):
@@ -140,6 +149,9 @@ class BmcgoConfig(object):
             return
         while cwd != "/":
             config_file = os.path.join(cwd, ".bmcgo", "config")
+            if not os.path.isfile(config_file):
+                config_file = os.path.join(cwd, ".bingo", "config")
+
             if os.path.isfile(config_file):
                 conf = configparser.ConfigParser()
                 conf.read(config_file)

bmcgo/cli/cli.py

@@ -50,8 +50,11 @@ class Command(object):
     parsing of parameters and delegates functionality in collaborators. It can also show the
     help of the tool.
     """
-    def __init__(self):
-        self.bconfig = BmcgoConfig()
+    def __init__(self, config: BmcgoConfig = None):
+        if not config:
+            self.bconfig = BmcgoConfig()
+        else:
+            self.bconfig = config
         # 请使用_get_command_group获取命令组
         self._command_group = None
         self.comp_cmds = {
@@ -86,6 +89,8 @@ class Command(object):
             misc.GRP_CONAN_IDX: self.conan_idx_cmds,
             misc.GRP_IBMC_SDK: self.ibmc_sdk_cmds
         }
+        # 扩展targets文件存储路径，由子类定义
+        self.ext_targets_dir = ""
 
     @property
     def __is_valid_component(self):
@@ -119,7 +124,7 @@ class Command(object):
         os.chdir(work_dir)
         config = Config(self.bconfig)
         frame = Frame(self.bconfig, config)
-        frame.parse(args)
+        frame.parse(args, self.ext_targets_dir)
         return frame.run()
 
     def help(self, *args):
@@ -128,7 +133,7 @@ class Command(object):
         """
 
         parser = argparse.ArgumentParser(description=self.help.__doc__,
-                                         prog="bingo help")
+                                         prog=misc.tool_name() + " help")
         parser.add_argument("command", help='command', nargs="?")
         args = parser.parse_args(*args)
         if not args.command:
@@ -207,7 +212,7 @@ class Command(object):
             test = TestComp(self.bconfig, argv)
             test.run()
         else:
-            log.error("这可能是一个无效的 bingo 组件, 因为 mds/service.json 文件不存在, 构建终止")
+            log.error(f"这可能是一个无效的 {misc.tool_name()} 组件, 因为 mds/service.json 文件不存在, 构建终止")
 
     # deploy package
     def deploy(self, *args):
@@ -215,7 +220,7 @@ class Command(object):
         将组件及其依赖部署至temp/rootfs目录
         """
         if not self.__is_valid_component:
-            log.error("这可能是一个无效的 bingo 组件, 因为 mds/service.json 文件不存在, 构建终止")
+            log.error(f"这可能是一个无效的 {misc.tool_name()} 组件, 因为 mds/service.json 文件不存在, 构建终止")
             return -1
         log.info("安装 package 目录到 ./temp, 开始!")
         argv = args[0]
@@ -236,6 +241,8 @@ class Command(object):
         """HIDDEN: entry point for executing commands, dispatcher to class
         methods
         """
+        if not self._check_conan():
+            return 1
         try:
             command = args[0][0]
         except IndexError:  # No parameters
@@ -243,7 +250,7 @@ class Command(object):
             return 0
         try:
             if command in ["-v", "--version"]:
-                self._show_version()
+                self.show_version()
                 return 0
 
             self._warn_python_version()
@@ -270,13 +277,19 @@ class Command(object):
                     return method(command_args)
 
         except SystemExit as exc:
+            if os.environ.get("LOG"):
+                log.error(traceback.format_exc())
             if exc.code != 0:
                 log.error("构建已退出, 退出码为: %d", exc.code)
             return exc.code
         except errors.ExitOk as exc:
+            if os.environ.get("LOG"):
+                log.error(traceback.format_exc())
             log.info(str(exc))
             return 0
         except (errors.BmcGoException, errors.EnvironmentException, KeyboardInterrupt) as exc:
+            if os.environ.get("LOG"):
+                log.error(traceback.format_exc())
             log.error(str(exc))
             log.error("请查看日志信息")
             return -1
@@ -287,9 +300,67 @@ class Command(object):
             log.error(msg)
             log.error("请查看日志信息")
             return -1
-        log.error("'%s' 不是 bingo 命令. 使用 'bingo -h' 查看帮助文档", command)
+        log.error("'%s' 不是 %s 命令. 使用 '%s -h' 查看帮助文档", command, misc.tool_name(), misc.tool_name())
         return -1
 
+    def show_version(self):
+        log.info("bingo 版本为: %s", client_version)
+        studio_version = self._bmc_studio_version()
+        if studio_version:
+            log.info("bmc-studio 版本为: %s", studio_version)
+
+    def _check_conan(self):
+        need_conan_v2 = False
+        conf = None
+        if self.bconfig.component:
+            conanfile = os.path.join(self.bconfig.component.folder, "conanfile.py")
+            conf = self.bconfig.component.config
+            if not os.path.isfile(conanfile):
+                log.info("未检测到组件的conanfile.py, 构建可能失败")
+                return True
+            with open(conanfile, "r") as fp:
+                lines = fp.readlines()
+            for line in lines:
+                if not line.startswith("required_conan_version"):
+                    continue
+                match = re.search("([0-9]+\\.[0-9]+\\.[0-9]+)", line)
+                if not match:
+                    continue
+                if match[0].startswith("2."):
+                    need_conan_v2 = True
+                    break
+        else:
+            if self.bconfig.ibmc_sdk:
+                conf = self.bconfig.ibmc_sdk.config
+            elif self.bconfig.manifest:
+                conf = self.bconfig.manifest.config
+            if conf:
+                conan_require = conf.get(misc.CONAN, "version", fallback="")
+                if conan_require.startswith("2"):
+                    need_conan_v2 = True
+            else:
+                return True
+        if need_conan_v2 and misc.conan_v1():
+            log.warning("检测到依赖conan2.0但仅安装了conan1.0，尝试重新安装conan2.0")
+            log.info("1. 组件仓支持conan2.0的依据：conanfile.py中未申明`required_conan_version`或依赖conan 2.x.x，\
+                     如`quired_conan_version = '>=2.13.0'`")
+            log.info("2. manifest或ibmc_sdk仓等支持conan2.0的依据：.bmcgo/config或.bingo/config文件记录的conan.version配置版本以2开头，如配置为:")
+            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")
+            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("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")
+            log.warning("检测到依赖conan1.0但仅安装了conan2.0，已安装conan1.0，任务退出，请重新执行")
+            return False
+        return True
+
     def _init_bmcgo_environ(self, command):
         if command not in SKIP_CONFIG_COMMANDS and misc.ENV_CONST in self.bconfig.bmcgo_config_list:
             log.info("检测到配置项环境变量，开始使用")
@@ -310,7 +381,7 @@ class Command(object):
         start_match_command = self._match_real_command(command, False)
         if start_match_command:
             return start_match_command
-        raise errors.CommandNotFoundException(f"未找到命令: {command}, 请执行bingo -h检查支持的命令")
+        raise errors.CommandNotFoundException(f"未找到命令: {command}, 请执行{misc.tool_name()} -h检查支持的命令")
 
     def _match_real_command(self, command, is_full_match=True):
         is_integrated, _ = self._is_integrated_project()
@@ -328,12 +399,6 @@ class Command(object):
                     return real_method
         return None
 
-    def _show_version(self):
-        log.info("bingo 版本为: %s", client_version)
-        studio_version = self._bmc_studio_version()
-        if studio_version:
-            log.info("bmc-studio 版本为: %s", studio_version)
-
     def _bmc_studio_version(self):
         """检查当前环境中正在使用的bmc studio版本，
         优先通过pip获取，获取不到通过bmc_studio/mds/server获取
@@ -467,9 +532,9 @@ class Command(object):
 
         log.info("")
         if self.bconfig.manifest is None and self.bconfig.component is None:
-            log.warning("未找到 .bmcgo/config或mds/service.json 配置文件, 当前路径可能未包含bingo项目")
+            log.warning(f"未找到 .bmcgo/config或mds/service.json 配置文件, 当前路径可能未包含 {misc.tool_name()} 项目")
             return
-        log.info('输入 "bingo <command> -h" 获取子命令帮助')
+        log.info(f'输入 "{misc.tool_name()} <command> -h" 获取子命令帮助')
 
     def _doc_append(self, lines):
         start = False
@@ -520,10 +585,12 @@ class Command(object):
 
 
 def prepare_conan():
+    if misc.conan_v2():
+        return
     home = os.environ["HOME"]
     settings_yml = os.path.join(home, ".conan", "settings.yml")
     if not os.path.isfile(settings_yml):
-        return 
+        return
     with open(settings_yml, mode="r") as fp:
         config_data = yaml.safe_load(fp)
     gcc = config_data["compiler"].get("gcc")
@@ -543,32 +610,17 @@ def prepare_conan():
         file_handler.write(yaml.safe_dump(config_data, indent=2, sort_keys=False))
 
 
-def main(args):
-    """ main entry point of the bmcgo application, using a Command to
+def run(args, command: Command = None):
+    """
+    main entry point of the bmcgo application, using a Command to
     parse parameters
     """
-
-    def ctrl_c_handler(_, __):
-        log.info('你按下了 Ctrl+C! 构建终止!')
-        sys.exit(-3)
-
-    def sigterm_handler(_, __):
-        log.info('接收到信号 SIGTERM! 构建终止!')
-        sys.exit(-5)
-
-    def ctrl_break_handler(_, __):
-        log.info('你按下了 Ctrl+Break! 构建终止!')
-        sys.exit(-4)
-
-    signal.signal(signal.SIGINT, ctrl_c_handler)
-    signal.signal(signal.SIGTERM, sigterm_handler)
-
-    if sys.platform == 'win32':
-        signal.signal(signal.SIGBREAK, ctrl_break_handler)
+    os.makedirs(misc.CACHE_DIR, exist_ok=True)
 
     try:
         prepare_conan()
-        command = Command()
+        if not command:
+            command = Command()
         error = command.run(args)
     except errors.ExitOk as exc:
         log.info(str(exc))
@@ -580,3 +632,7 @@ def main(args):
         log.error(msg)
         error = -1
     return error
+
+
+def main(args):
+    return run(args)

bmcgo/cli/config.conan2.yaml

@@ -0,0 +1,9 @@
+comp_type:
+  - conan_index
+  - 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

bmcgo/codegen/lua/codegen.py

@@ -51,7 +51,7 @@ class CodeGen(object):
             return lua_format
 
     def get_mdb_interface_package(self):
-        channel = f"@{Tools().conan_user}/{misc.StageEnum.STAGE_RC.value}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
         package = f"mdb_interface/[>=0.0.1]{channel}"
         dependencies = self.read_service_json().get(misc.CONAN_DEPDENCIES_KEY)
         if not dependencies:
@@ -110,7 +110,7 @@ class CodeGen(object):
         mdb_interface_tmp_dir = os.path.join(conan_home, "latest_mdb_interface")
         env = dict(os.environ, CONAN_STORAGE_PATH=mdb_interface_tmp_dir)
 
-        channel = f"@{Tools().conan_user}/{misc.StageEnum.STAGE_RC.value}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
         package = f"mdb_interface/[>=0.0.1]{channel}"
         
         cmd = ["conan", "install", package, f"-if={temp_dir}", "--update", "--build=missing", "-g", "deploy"]

bmcgo/codegen/lua/script/gen_intf_rpc_json.py

@@ -454,9 +454,6 @@ def generate_only_interface(intf_dep: InterfaceDep, service, imports, mdb_path):
 
 def fill_client_intf(service, imports, mdb_path, required, path):
     intf_dep = InterfaceDep(required)
-    intf_seg = (intf_dep.name).split('.')
-    if len(intf_seg) >= 3 and intf_seg[2] == 'Debug':
-        raise Exception(f"在service.json中配置了调试版本的依赖项, interface: {intf_dep.name}")
     if path != "*":
         class_name, path_json = utils.get_path_by_interface(mdb_path, required["interface"], path)
         generate_path_interface(
@@ -482,10 +479,20 @@ def check_multiple_paths(interfaces):
             intf_map[intf_name] = True
 
 
+## 匹配APP下的service_json_path目录，如果是扩展组件，层级为3
+def match_level(service_json_path):
+    path_level = 0
+    match = re.search(r'.*(/[^/]+/mds/.*)', service_json_path)
+    if match:
+        mds_path = match.group(1)
+        path_level = count_dir_level(mds_path)
+    return path_level
+
+
 def generate_client(service_file, output, mdb_path, mds_path, path_level):
     load_f = utils.open_file(service_file)
     service_dict = json.load(load_f)
-
+    service_level = match_level(service_file)
     imports = {"intf": {}, KLASS: {}}
     if "required" not in service_dict:
         load_f.close()
@@ -499,6 +506,10 @@ def generate_client(service_file, output, mdb_path, mds_path, path_level):
     signals = []
     service = {INTERFACES: interfaces, METHODS: methods, SIGNALS: signals}
     for required in service_dict["required"]:
+        intf_dep = InterfaceDep(required)
+        intf_seg = (intf_dep.name).split('.')
+        if service_level == 2 and len(intf_seg) >= 3 and intf_seg[2] == 'Debug':
+            raise Exception(f"在service.json中配置了调试版本的依赖项, interface: {intf_dep.name}")
         if PATH in required:
             fill_client_intf(service, imports, mdb_path, required, required[PATH])
             continue
@@ -530,16 +541,6 @@ def count_dir_level(path):
     return level
 
 
-## 匹配APP下的service_json_path目录，如果是扩展组件，层级为3
-def match_level(service_json_path):
-    path_level = 0
-    match = re.search(r'.*(/[^/]+/mds/.*)', service_json_path)
-    if match:
-        mds_path = match.group(1)
-        path_level = count_dir_level(mds_path)
-    return path_level
-
-
 def main(argv):
     m_input = ""
     output = ""

bmcgo/component/analysis/analysis.py

@@ -44,12 +44,12 @@ class AnalysisComp():
         self.nodes: list[DepNode] = []
         self.subsystems = {}
         self.rules: list[Rules] = []
+        self.rule_file = os.path.join(script_dir, "dep-rules.json")
 
     def read_rules(self):
-        rule_file = os.path.join(script_dir, "dep-rules.json")
-        if not os.path.isfile(rule_file):
-            raise Exception(f"依赖规则文件 {rule_file} 不存在")
-        with open(rule_file) as file_descriptor:
+        if not os.path.isfile(self.rule_file):
+            raise Exception(f"依赖规则文件 {self.rule_file} 不存在")
+        with open(self.rule_file) as file_descriptor:
             rules = json.load(file_descriptor)
         data = rules.get("Subsystems", [])
         for sub in data:
@@ -108,17 +108,17 @@ class AnalysisComp():
                 break
             node = DepNode(node_data, i)
             # busybox是调测包，当dev包引入时忽略架构治理分析（由schema模型看护）
-            user_stage = f"{misc.ConanUserEnum.CONAN_USER_DEV.value}/{misc.StageEnum.STAGE_DEV.value}"
-            if node.package_name == "busybox" and user_stage in node.ref:
+            if node.package_name == "busybox" and "/dev" in node.ref:
                 continue
             packages[node.index] = node
             requires[node.index] = node_data.get("requires", [])
+        comm_name = misc.community_name()
         for index, pkg in packages.items():
-            if not pkg.name.startswith("openubmc"):
+            if not pkg.name.startswith(comm_name):
                 self.set_node_subsys(pkg)
             for require_id in requires.get(index, []):
                 pkg.requires.append(packages.get(int(require_id), None))
-            if not pkg.name.startswith("openubmc"):
+            if not pkg.name.startswith(comm_name):
                 self.nodes.append(pkg)
 
     def run(self):

bmcgo/component/analysis/intf_validation.py

@@ -17,6 +17,7 @@ import os
 import re
 import shutil
 import subprocess
+from tempfile import TemporaryDirectory
 
 from bmcgo.logger import Logger
 from bmcgo.codegen.c.helper import Helper
@@ -63,15 +64,18 @@ class InterfaceValidation:
 
     @staticmethod
     def _parse_mds_package_deps():
-        channel = f"@{misc.ConanUserEnum.CONAN_USER_RELEASE.value}/{misc.StageEnum.STAGE_RC.value}"
-        package = f"mdb_interface/[>=0.0.1]{channel}"
+        channel = f"@{misc.conan_user()}/{misc.StageEnum.STAGE_RC.value}"
+        if misc.conan_v1():
+            package = f"mdb_interface/[>=0.0.1]{channel}"
+        else:
+            package = f"mdb_interface/[>=0.0.1]@{misc.conan_user()}/stable"
         service_path = os.path.join(os.getcwd(), "mds/service.json")
         if not os.path.exists(service_path):
             return package
         with open(service_path, "r") as service_fp:
             try:
                 content = json.load(service_fp)
-            except json.decoder.JSONDecodeError as error:
+            except json.decoder.JSONDecodeError:
                 return package
         dependencies = content.get("dependencies")
         if not dependencies:
@@ -82,10 +86,13 @@ class InterfaceValidation:
             conan_package = dep.get(misc.CONAN, "")
             if not conan_package.startswith("mdb_interface"):
                 continue
-            if "@" in conan_package:
-                package = conan_package
+            if misc.conan_v1():
+                if "@" in conan_package:
+                    package = conan_package
+                else:
+                    package = f"{conan_package}{channel}"
             else:
-                package = f"{conan_package}{channel}"
+                return conan_package
         return package
 
     def run(self):
@@ -160,11 +167,16 @@ class InterfaceValidation:
 
     def _pull_interfaces_from_conan(self):
         pkg = self._parse_mds_package_deps()
-        mktemp_cmd = subprocess.run(["/usr/bin/mktemp", "-d", "--suffix", "_mdb_interface"], capture_output=True)
-        if mktemp_cmd.returncode != 0:
-            raise OSError(f"创建文件夹失败, 错误消息: {mktemp_cmd.stderr}")
-        temp_dir = mktemp_cmd.stdout.decode().strip('\n')
-        cmd = [misc.CONAN, "install", pkg, f"-if={temp_dir}", "--build=missing", "-g", "deploy", "-s", "build_type=Dt"]
+        temp = TemporaryDirectory()
+        temp_dir = temp.name
+        if misc.conan_v1():
+            cmd = [misc.CONAN, "install", pkg, f"-if={temp_dir}",
+                   "--build=missing", "-g", "deploy", "-s", "build_type=Dt"]
+        else:
+            ins_dir = os.path.join(temp_dir, "mdb_interface")
+            os.makedirs(ins_dir)
+            cmd = [misc.CONAN, "install", f"--requires={pkg}", f"-of={ins_dir}", "--build=missing", "-d",
+                   "direct_deploy", "-pr", "profile.dt.ini", "-o", "test=True"]
         if self.remote:
             cmd += ["-r", self.remote]
         subprocess.call(cmd)
@@ -176,7 +188,6 @@ class InterfaceValidation:
                     continue
                 file_path = os.path.join(root, file_name)
                 self.all_predefined_intfs.update(intf for intf in self.extract_dbus_intf_in_file(file_path))
-        shutil.rmtree(temp_dir, ignore_errors=True)
 
     def _pull_interfaces_from_codegen(self):
         service_path = os.path.join(os.getcwd(), "mds/service.json")