No registry dependency (#23)

* Scons is installed via pioarduino core

Author: Jason2866

.github/workflows/examples.yml

@@ -43,7 +43,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install wheel
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
+          pip install -U https://github.com/pioarduino/platformio-core/archive/refs/tags/v6.1.16+test.tar.gz
           pio pkg install --global --platform symlink://.
       - name: Build examples
         run: |

builder/main.py

@@ -24,26 +24,36 @@
     DefaultEnvironment)
 
 from platformio.util import get_serial_ports
+from platformio.proc import exec_command, where_is_program
 
+pio_exe = where_is_program("platformio")
 env = DefaultEnvironment()
 platform = env.PioPlatform()
+board = env.BoardConfig()
+mcu = board.get("build.mcu", "esp32")
 
 #
 # Helpers
 #
 
-FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
+PLATFORM_PATH = env.GetProjectOption("platform")
+PLATFORM_CMD = (
+    pio_exe,
+    "pkg",
+    "install",
+    "--global",
+    "--platform",
+    PLATFORM_PATH,
+)
 
-#IDF_TOOLS_PATH_DEFAULT = os.path.join(os.path.expanduser("~"), ".espressif")
-#IDF_TOOLS = join(platform.get_package_dir("tl-install"), "tools", "idf_tools.py")
-#IDF_TOOLS_FLAG = ["install"]
-#IDF_TOOLS_CMD = [env["PYTHONEXE"], IDF_TOOLS] + IDF_TOOLS_FLAG
+# install platform again to install missing packages, needed since no registry install
+if bool(platform.get_package_dir("tc-%s" % ("rv32" if mcu in ("esp32c2", "esp32c3", "esp32c6", "esp32h2") else ("xt-%s" % mcu)))) == False:
+    result = exec_command(PLATFORM_CMD)
+    if result["returncode"] != 0:
+        sys.stderr.write(result["err"] + "\n")
+        env.Exit(1)
 
-## IDF Install is needed only one time
-#if not os.path.exists(join(IDF_TOOLS_PATH_DEFAULT, "tools")):
-#    rc = subprocess.call(IDF_TOOLS_CMD)
-#    if rc != 0:
-#        sys.stderr.write("Error: Couldn't execute 'idf_tools.py install' \n")
+FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
 
 
 def BeforeUpload(target, source, env):

platform.json

@@ -140,11 +140,6 @@
       "owner": "",
       "version": ""
     },
-    "tool-scons": {
-      "optional": false,
-      "owner": "",
-      "version": "https://github.com/pioarduino/scons/releases/download/4.7.0/scons-local-4.7.0.tar.gz"
-    },
     "tool-cppcheck": {
       "optional": true,
       "owner": "",

platform.py

@@ -20,21 +20,15 @@
 
 from platformio.public import PlatformBase, to_unix_path
 from platformio.proc import get_pythonexe_path
-from platformio.package.manager.tool import ToolPackageManager
+from platformio.project.config import ProjectConfig
 
 python_exe = get_pythonexe_path()
-pm = ToolPackageManager()
-IS_WINDOWS = sys.platform.startswith("win")
+
 IDF_TOOLS_PATH_DEFAULT = os.path.join(os.path.expanduser("~"), ".espressif")
-try:
-    tl_path = pm.get_package("tl-install").path
-    IDF_TOOLS = os.path.join(tl_path, "tools", "idf_tools.py")
-except:
-    IDF_TOOLS = ""
+IDF_TOOLS = os.path.join(ProjectConfig.get_instance().get("platformio", "packages_dir"), "tl-install", "tools", "idf_tools.py")
 IDF_TOOLS_FLAG = ["install"]
 IDF_TOOLS_CMD = [python_exe, IDF_TOOLS] + IDF_TOOLS_FLAG
 
-
 class Espressif32Platform(PlatformBase):
     def configure_default_packages(self, variables, targets):
         if not variables.get("board"):
@@ -43,22 +37,20 @@ def configure_default_packages(self, variables, targets):
         board_config = self.board_config(variables.get("board"))
         mcu = variables.get("board_build.mcu", board_config.get("build.mcu", "esp32"))
         frameworks = variables.get("pioframework", [])
-        try:
-            tl_flag = bool(pm.get_package("tl-install").path)
-        except:
-            tl_flag = False
+        tl_flag = bool(os.path.exists(IDF_TOOLS))
 
         # IDF Install is needed only one time
         if not os.path.exists(join(IDF_TOOLS_PATH_DEFAULT, "tools")) and tl_flag:
             rc = subprocess.call(IDF_TOOLS_CMD)
             if rc != 0:
-                sys.stderr.write("Error: Couldn't execute 'idf_tools.py install' \n")
+                sys.stderr.write("Error: Couldn't execute 'idf_tools.py install'\n")
             else:
                 shutil.copytree(join(IDF_TOOLS_PATH_DEFAULT, "tools", "tool-packages"), join(IDF_TOOLS_PATH_DEFAULT, "tools"), symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
 
         if tl_flag:
-            # Install all tools and toolchains
+            # install tool is not needed anymore
             self.packages["tl-install"]["optional"] = True
+            # Install all tools and toolchains
             for p in self.packages:
                 if p in ("tool-mklittlefs", "tool-mkfatfs", "tool-mkspiffs", "tool-dfuutil", "tool-openocd", "tool-cmake", "tool-ninja", "tool-cppcheck", "tool-clangtidy", "tool-pvs-studio", "contrib-piohome", "contrib-pioremote", "tc-ulp", "tc-rv32", "tl-xt-gdb", "tl-rv-gdb"):
                     tl_path = "file://" + join(IDF_TOOLS_PATH_DEFAULT, "tools", p)
@@ -70,7 +62,7 @@ def configure_default_packages(self, variables, targets):
                     self.packages[p]["optional"] = False if "espidf" in frameworks else True
             # Enabling of following tools is not needed, installing is enough
             for p in self.packages:
-                if p in ("contrib-pioremote", "contrib-piohome", "tool-scons"):
+                if p in ("contrib-pioremote", "contrib-piohome"):
                     try:
                         pkg_dir = pm.get_package(p).path
                         # When package is not found an execption happens -> install is forced