Merge branch 'release/v7.1.0'

Author: valeros

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxpimxrt.git"
   },
-  "version": "7.0.0",
+  "version": "7.1.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -48,7 +48,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.40000.0"
+      "version": "~3.40100.0"
     },
     "tool-openocd": {
       "type": "debugger",

platform.py

@@ -17,6 +17,7 @@
 import subprocess
 
 from platformio.public import PlatformBase
+from platformio.project.helpers import get_project_dir
 
 
 IS_WINDOWS = sys.platform.startswith("win")
@@ -68,16 +69,26 @@ def install_package(self, name, *args, **kwargs):
         if name != "framework-zephyr":
             return pkg
 
-        if not os.path.isfile(os.path.join(pkg.path, "_pio", "state.json")):
-            self.pm.log.info("Installing Zephyr project dependencies...")
-            try:
-                subprocess.run([
-                    os.path.normpath(sys.executable),
-                    os.path.join(pkg.path, "scripts", "platformio", "install-deps.py"),
-                    "--platform", self.name
-                ])
-            except subprocess.CalledProcessError:
-                self.pm.log.info("Failed to install Zephyr dependencies!")
+        prj_west_manifest = os.path.join(get_project_dir(), "west.yml")
+        try:
+            (
+                subprocess.run(
+                    [
+                        os.path.normpath(sys.executable),
+                        os.path.join(
+                            pkg.path, "scripts", "platformio", "install-deps.py"
+                        ),
+                        "--platform",
+                        self.name,
+                    ] + (
+                        ["--manifest", prj_west_manifest]
+                        if os.path.isfile(prj_west_manifest)
+                        else []
+                    )
+                )
+            )
+        except subprocess.CalledProcessError:
+            self.pm.log.info("Failed to install Zephyr dependencies!")
 
         return pkg