Add comments for Matter SDK building related commands

canonical · Dec 12, 2023 · 76fa675 · 76fa675
1 parent 311052a
commit 76fa675
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/snapcraft/parts/plugins/matter_plugin.py b/snapcraft/parts/plugins/matter_plugin.py
@@ -124,14 +124,24 @@ def get_build_commands(self) -> List[str]:
                 ]
             )
 
+        """Clone Matter repository if not present"""
+        commands.extend(
+            [
+                f"if [ ! -d matter ]; then git clone --depth 1 -b v1.2.0.1 {MATTER_REPO} matter && cd matter; "
+                f"else cd matter || echo 'skip clone'; fi"
+            ]
+        )
+
+        """Checkout submodules for Linux platform"""
+        commands.extend(["scripts/checkout_submodules.py --shallow --platform linux"])
+
+        """Bootstrapping script for building Matter SDK and setting up the environment"""
+        commands.extend(["set +u && source setup/bootstrap.sh && set -u"])
+
         commands.extend(
             [
-                f"if [ ! -d matter ]; then git clone --depth 1 -b v1.2.0.1 {MATTER_REPO} matter; fi",
-                "cd matter || echo 'skip clone'",
-                f"scripts/checkout_submodules.py --shallow --platform linux",
-                f"set +u && source scripts/activate.sh && set -u",
                 "cp -vr ./* $CRAFT_PART_INSTALL/",
-                "echo 'Cloned Matter repository and activated submodules'",
+                "echo 'Cloned Matter repository and built Matter SDK'",
             ]
         )
 

diff --git a/snapcraft/parts/plugins/register.py b/snapcraft/parts/plugins/register.py
@@ -30,6 +30,7 @@ def register() -> None:
     """Register Snapcraft plugins."""
     craft_parts.plugins.register({"colcon": ColconPlugin})
     craft_parts.plugins.register({"conda": CondaPlugin})
-    craft_parts.plugins.register({"matter": MatterPlugin})
+    craft_parts.plugins.register({"flutter": FlutterPlugin})
     craft_parts.plugins.register({"python": PythonPlugin})
     craft_parts.plugins.register({"kernel": KernelPlugin})
+    craft_parts.plugins.register({"matter": MatterPlugin})