idf-build-apps 2.14.0__py3-none-any.whl → 2.15.1__py3-none-any.whl

idf_build_apps/__init__.py

@@ -8,7 +8,7 @@ Tools for building ESP-IDF related apps.
 # ruff: noqa: E402
 # avoid circular imports
 
-__version__ = '2.14.0'
+__version__ = '2.15.1'
 
 from .session_args import (
     SessionArgs,

idf_build_apps/app.py

@@ -956,7 +956,11 @@ class CMakeApp(App):
 
     # While ESP-IDF component CMakeLists files can be identified by the presence of 'idf_component_register' string,
     # there is no equivalent for the project CMakeLists files. This seems to be the best option...
-    CMAKE_PROJECT_LINE: t.ClassVar[str] = r'include($ENV{IDF_PATH}/tools/cmake/project.cmake)'
+    # Support both build system v1 and v2 patterns
+    CMAKE_PROJECT_LINE: t.ClassVar[t.List[str]] = [
+        r'include($ENV{IDF_PATH}/tools/cmake/project.cmake)',
+        r'include($ENV{IDF_PATH}/tools/cmakev2/idf.cmake)',
+    ]
 
     build_system: Literal['cmake'] = 'cmake'  # type: ignore
 
@@ -1064,10 +1068,12 @@ class CMakeApp(App):
         if not cmakelists_file_content:
             return False
 
-        if cls.CMAKE_PROJECT_LINE not in cmakelists_file_content:
-            return False
+        # Check if any of the supported build system patterns are present
+        for pattern in cls.CMAKE_PROJECT_LINE:
+            if pattern in cmakelists_file_content:
+                return True
 
-        return True
+        return False
 
 
 class AppDeserializer(BaseModel):

idf_build_apps/args.py

@@ -929,6 +929,18 @@ class DumpManifestShaArguments(GlobalArguments):
         description='Path to the manifest files which contains the build test rules of the apps',
         default=None,  # type: ignore
     )
+    common_components: t.Optional[t.List[str]] = field(
+        FieldMetadata(
+            validate_method=[ValidateMethod.TO_LIST],
+            type=semicolon_separated_str_to_list,
+            shorthand='-rc',
+        ),
+        description='semicolon-separated list of components. '
+        'expand the `- *common_components` placeholder in manifests. '
+        'If set to "", the value would be considered as None. '
+        'If set to ";", the value would be considered as an empty list.',
+        default=None,  # type: ignore
+    )
 
     output: t.Optional[str] = field(
         FieldMetadata(

idf_build_apps/main.py

@@ -394,7 +394,9 @@ def main():
 
     if action == 'dump-manifest-sha':
         arguments = DumpManifestShaArguments(**kwargs_without_none)
-        Manifest.from_files(arguments.manifest_files).dump_sha_values(arguments.output)
+        Manifest.from_files(arguments.manifest_files, common_components=arguments.common_components).dump_sha_values(
+            arguments.output
+        )
         sys.exit(0)
 
     if action == 'find':

idf_build_apps/yaml/parser.py

@@ -77,6 +77,8 @@ def flatten_common_components(manifest_dict: t.Dict):
 
         flattened: t.List[str] = []
         for item in depends:
+            if not item:
+                continue
             if isinstance(item, t.List):
                 flattened.extend(map(str, item))
             else:
@@ -89,7 +91,7 @@ def parse(path: PathLike, *, common_components: t.Optional[t.Sequence[str]] = No
     common_components_yaml = (
         '.common_components: &common_components\n' + '\n'.join(f'  - {component}' for component in common_components)
         if common_components
-        else ''
+        else '.common_components: &common_components\n  null'
     )
 
     with open(path, encoding='utf-8') as f:

{idf_build_apps-2.14.0.dist-info → idf_build_apps-2.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idf-build-apps
-Version: 2.14.0
+Version: 2.15.1
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7

{idf_build_apps-2.14.0.dist-info → idf_build_apps-2.15.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-idf_build_apps/__init__.py,sha256=aPohj9cU8yfQCqYn7wKsJDjVMUJq6A__07PNoAFUHbs,711
+idf_build_apps/__init__.py,sha256=vqnHqkjVySCAsUMu7GlaBMUFZ6fUOdCGJkPq-l0bf_k,711
 idf_build_apps/__main__.py,sha256=xbvcgp3sNxXZZ0MMr9XU12TjdzHBWq6DF1FYUSmAjHE,182
-idf_build_apps/app.py,sha256=_B4kCTCUq7mSd6T-VwtLbBM9iHSpXRpfM0vmrznkjYo,40223
-idf_build_apps/args.py,sha256=sdp7eI33BXKmqucs60sS0kK8l5p4fRpRS6H7Y0XyITY,40803
+idf_build_apps/app.py,sha256=XfZuDRvEbtsBGqagc4az-LYnbK3y7lxQIvpUk9r4A5Q,40469
+idf_build_apps/args.py,sha256=KosT-D3DHURq6valzeLLim6K2flApR-Y6UCZBvhvc5E,41342
 idf_build_apps/autocompletions.py,sha256=UbswHAWRvqvq4TgDBFjqHGlDLS_NEBM8EE0LlLUYY0A,2143
 idf_build_apps/constants.py,sha256=CW7vKXV6brsNLWeGLNCoDj28r5GO9So3RFNqgk_X2CI,2166
 idf_build_apps/finder.py,sha256=eSIr-y5yPTInQk5IQHggRJyxOndciexaNzpU4VVhfQQ,5833
 idf_build_apps/log.py,sha256=2aJRqx3hPT9IhSv3RLkXR5j7PgB2RX47G766c4i_m5c,3899
-idf_build_apps/main.py,sha256=B5yb6cy5UgqHP8-f7VEc9CrbkQmWGEpf6ww70MC_1z8,18255
+idf_build_apps/main.py,sha256=qJCa6kXsffrBfosJBXQeZ8X9dfaJ5DJ-20iGws4an-E,18324
 idf_build_apps/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 idf_build_apps/session_args.py,sha256=BMWfW48hHHt5UsAbzTJ9BMnerVP5lnulb0h3Db-BNC8,2973
 idf_build_apps/utils.py,sha256=YAVIYTvz86G--qjh58H376taQ-qe1PbebXcWxYNdnFs,10976
@@ -19,9 +19,9 @@ idf_build_apps/manifest/soc_header.py,sha256=vBO8oDEIIcxWRCDOPNXtqHKU0yv8q4yMrTo
 idf_build_apps/vendors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 idf_build_apps/vendors/pydantic_sources.py,sha256=cxSIPRc3eI5peVMhDxwf58YaGhuG4SCwPRVX2znFEek,4553
 idf_build_apps/yaml/__init__.py,sha256=lbBz5r6hp8dSsxIypGFcc5EbXgWw2codDmky8QCo-sg,167
-idf_build_apps/yaml/parser.py,sha256=qlPZbLOM48CFs4F8i83Sa0QAl8AA-DQceWozTE_CkHM,3191
-idf_build_apps-2.14.0.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
-idf_build_apps-2.14.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-idf_build_apps-2.14.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-idf_build_apps-2.14.0.dist-info/METADATA,sha256=Zo3oJH3A2BCUuQmQ67mhFNw68LrXWfJvDwP5SngpIp4,4795
-idf_build_apps-2.14.0.dist-info/RECORD,,
+idf_build_apps/yaml/parser.py,sha256=fdqlRsepAhb-_iynn0_TPMCk9qutMSl0cDRMxYKoPr0,3287
+idf_build_apps-2.15.1.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
+idf_build_apps-2.15.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+idf_build_apps-2.15.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+idf_build_apps-2.15.1.dist-info/METADATA,sha256=3wApFMgDQuljzJEmh0tkDpEbdWAlYhKLLK5bpF0-bxA,4795
+idf_build_apps-2.15.1.dist-info/RECORD,,