Merge branch 'release/v6.1.11'

HISTORY.rst

@@ -17,6 +17,12 @@ Unlock the true potential of embedded software development with
 PlatformIO's collaborative ecosystem, embracing declarative principles,
 test-driven methodologies, and modern toolchains for unrivaled success.
 
+6.1.11 (2023-08-31)
+~~~~~~~~~~~~~~~~~~~
+
+* Resolved a possible issue that may cause generated projects for `PlatformIO IDE for VSCode <https://docs.platformio.org/en/latest/integration/ide/vscode.html>`__ to fail to launch a debug session because of a missing "objdump" binary when GDB is not part of the toolchain package
+* Resolved a regression issue that resulted in the malfunction of the Memory Inspection feature within `PIO Home <https://docs.platformio.org/en/latest/home/index.html>`__
+
 6.1.10 (2023-08-11)
 ~~~~~~~~~~~~~~~~~~~
 

platformio/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, 10)
+VERSION = (6, 1, 11)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/home/rpc/handlers/project.py

@@ -42,9 +42,9 @@ def config_call(init_kwargs, method, *args):
             project_dir = init_kwargs["path"]
             init_kwargs["path"] = os.path.join(init_kwargs["path"], "platformio.ini")
         elif os.path.isfile(init_kwargs["path"]):
-            project_dir = get_project_dir()
-        else:
             project_dir = os.path.dirname(init_kwargs["path"])
+        else:
+            project_dir = get_project_dir()
         with fs.cd(project_dir):
             return getattr(ProjectConfig(**init_kwargs), method)(*args)
 

platformio/package/commands/install.py

@@ -20,6 +20,7 @@
 
 from platformio import fs
 from platformio.package.exception import UnknownPackageError
+from platformio.package.manager.core import get_core_package_dir
 from platformio.package.manager.library import LibraryPackageManager
 from platformio.package.manager.platform import PlatformPackageManager
 from platformio.package.manager.tool import ToolPackageManager
@@ -120,7 +121,7 @@ def install_project_env_dependencies(project_env, options=None):
     # custom tools
     if options.get("tools"):
         installed_conds.append(_install_project_env_custom_tools(project_env, options))
-    # custom ibraries
+    # custom libraries
     if options.get("libraries"):
         installed_conds.append(
             _install_project_env_custom_libraries(project_env, options)
@@ -152,6 +153,8 @@ def _install_project_env_platform(project_env, options):
         skip_dependencies=options.get("skip_dependencies"),
         force=options.get("force"),
     )
+    # ensure SCons is installed
+    get_core_package_dir("tool-scons")
     return not already_up_to_date
 
 

platformio/project/integration/tpls/vscode/.vscode/launch.json.tpl

@@ -17,7 +17,7 @@
 %    "name": "PIO Debug (skip Pre-Debug)",
 %    "executable": _escape_path(prog_path),
 %    "projectEnvName": env_name if forced_env_name else default_debug_env_name,
-%    "toolchainBinDir": _escape_path(os.path.dirname(gdb_path)),
+%    "toolchainBinDir": _escape_path(os.path.dirname(cc_path)),
 %    "internalConsoleOptions": "openOnSessionStart",
 %  }
 %

tests/commands/pkg/test_install.py

@@ -18,7 +18,7 @@
 
 import pytest
 
-from platformio import fs
+from platformio import __core_packages__, fs
 from platformio.package.commands.install import package_install_cmd
 from platformio.package.manager.library import LibraryPackageManager
 from platformio.package.manager.platform import PlatformPackageManager
@@ -148,7 +148,7 @@ def test_skip_dependencies(
             ),
             PackageSpec("[email protected]"),
         ]
-        assert len(ToolPackageManager().get_installed()) == 0
+        assert len(ToolPackageManager().get_installed()) == 1  # SCons
 
 
 def test_baremetal_project(
@@ -177,6 +177,7 @@ def test_baremetal_project(
             ),
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("[email protected]"),
         ]
 
@@ -209,6 +210,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("[email protected]"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("[email protected]"),
         ]
         assert config.get("env:devkit", "lib_deps") == [

tests/commands/pkg/test_uninstall.py

@@ -198,6 +198,7 @@ def test_project(clirunner, validate_cliresult, isolated_pio_core, tmp_path):
         assert pkgs_to_names(lm.get_installed()) == ["DallasTemperature", "OneWire"]
         assert pkgs_to_names(ToolPackageManager().get_installed()) == [
             "framework-arduino-avr-attiny",
+            "tool-scons",
             "toolchain-atmelavr",
         ]
         assert config.get("env:devkit", "lib_deps") == [
@@ -224,7 +225,7 @@ def test_project(clirunner, validate_cliresult, isolated_pio_core, tmp_path):
             os.path.join(config.get("platformio", "libdeps_dir"), "devkit")
         )
         assert not pkgs_to_names(lm.get_installed())
-        assert not pkgs_to_names(ToolPackageManager().get_installed())
+        assert pkgs_to_names(ToolPackageManager().get_installed()) == ["tool-scons"]
         assert config.get("env:devkit", "lib_deps") == [
             "milesburton/DallasTemperature@^3.9.1"
         ]

tests/commands/pkg/test_update.py

@@ -16,7 +16,7 @@
 
 import os
 
-from platformio import fs
+from platformio import __core_packages__, fs
 from platformio.package.commands.install import package_install_cmd
 from platformio.package.commands.update import package_update_cmd
 from platformio.package.exception import UnknownPackageError
@@ -172,6 +172,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("[email protected]"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("[email protected]"),
         ]
         assert config.get("env:devkit", "lib_deps") == [
@@ -201,6 +202,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("[email protected]"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("[email protected]"),
             PackageSpec("[email protected]"),
         ]