From 802b7c7aee3e5f205dbbbfbfba95e2b65550759d Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Tue, 21 Apr 2026 16:08:28 +0200
Subject: [PATCH] Berry solidification is now part of the build system (#24664)

* Berry solidification if now part of the build system

* Force Python in UTF-8 on Windows
---
 CHANGELOG.md                      |  1 +
 pio-tools/gen-berry-structures.py | 96 ++++++++++++++++++++++++++++++-
 pio-tools/solidify-from-url.py    |  2 +-
 3 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b896f599..819c69889 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ## [15.3.0.4]
 ### Added
+- Berry solidification is now part of the build system
 
 ### Breaking Changed
 
diff --git a/pio-tools/gen-berry-structures.py b/pio-tools/gen-berry-structures.py
index c59360b13..766887752 100644
--- a/pio-tools/gen-berry-structures.py
+++ b/pio-tools/gen-berry-structures.py
@@ -3,11 +3,103 @@ Import("env")
 import os
 import glob
 import subprocess
-from os.path import join
+from os.path import join, isfile
 
 # generate all precompiled Berry structures from multiple modules
 CURRENT_DIR = os.getcwd()
-BERRY_GEN_DIR = join(env.subst("$PROJECT_DIR"), "lib", "libesp32","berry")
+PROJECT_DIR = env.subst("$PROJECT_DIR")
+BERRY_GEN_DIR = join(PROJECT_DIR, "lib", "libesp32", "berry")
+BERRY_PORT_DIR = BERRY_GEN_DIR  # PYTHONPATH root for `berry_port` module
+
+# ---------------------------------------------------------------------------
+# Step 1 - run all `solidify_all_python.be` scripts in pure Python
+#
+# Each script has a shebang of the form:
+#   #!/usr/bin/env -S PYTHONPATH=<relative>/berry python3 -m berry_port -s -g
+# We replicate this here by invoking `python3 -m berry_port -s -g <script>`
+# from the script's own directory, with PYTHONPATH pointing to
+# lib/libesp32/berry (so that the `berry_port` module is importable).
+#
+# This step can be skipped by adding `-DDISABLE_BERRY_SOLIDIFY` to
+# `build_flags` (useful when iterating on C/C++ code without touching Berry
+# sources, or when `python3` is unavailable in the build environment).
+# ---------------------------------------------------------------------------
+
+build_flags = " ".join(env['BUILD_FLAGS'])
+if "DISABLE_BERRY_SOLIDIFY" in build_flags:
+    print("Berry solidification disabled via -DDISABLE_BERRY_SOLIDIFY")
+else:
+    SOLIDIFY_DIRS = [
+        join(PROJECT_DIR, "lib", "libesp32", "berry_tasmota"),
+        join(PROJECT_DIR, "lib", "libesp32", "berry_matter"),
+        join(PROJECT_DIR, "lib", "libesp32", "berry_animation"),
+        join(PROJECT_DIR, "lib", "libesp32_lvgl", "lv_binding_berry"),
+        join(PROJECT_DIR, "lib", "libesp32_lvgl", "lv_haspmota"),
+    ]
+
+    solidify_env = os.environ.copy()
+    # Prepend our berry_port path so it wins over any pre-existing PYTHONPATH
+    existing_pp = solidify_env.get("PYTHONPATH", "")
+    solidify_env["PYTHONPATH"] = (
+        BERRY_PORT_DIR + (os.pathsep + existing_pp if existing_pp else "")
+    )
+    # Force UTF-8 mode (PEP 540) so Python uses UTF-8 for open()/stdio
+    # regardless of the host locale. This is required on Windows where the
+    # default code page (e.g. cp1252) otherwise fails to read some Berry
+    # source files (notably in lib/libesp32/berry_animation).
+    solidify_env["PYTHONUTF8"] = "1"
+
+    for solidify_dir in SOLIDIFY_DIRS:
+        script = join(solidify_dir, "solidify_all_python.be")
+        if not isfile(script):
+            continue
+        rel_script = os.path.relpath(script, PROJECT_DIR)
+        print(f"Solidifying: {rel_script}")
+        os.chdir(solidify_dir)
+        solidify_cmd = (
+            env["PYTHONEXE"],
+            "-m", "berry_port",
+            "-s", "-g",
+            "solidify_all_python.be",
+        )
+        proc = subprocess.Popen(
+            solidify_cmd,
+            shell=False,
+            env=solidify_env,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+        )
+        other_lines = []
+        for raw in proc.stdout:
+            line = raw.rstrip("\r\n")
+            stripped = line.strip()
+            # Silence routine per-file chatter; keep anything that looks
+            # like an error, warning, or traceback.
+            if stripped.startswith("Parsing:"):
+                continue
+            if stripped.startswith("Skipping:"):
+                continue
+            if stripped.startswith("# Output directory"):
+                continue
+            other_lines.append(line)
+        rc = proc.wait()
+        # Surface anything the script emitted that wasn't routine chatter
+        # - warnings, errors, tracebacks, etc.
+        for line in other_lines:
+            if line:
+                print(line)
+        if rc != 0:
+            print(f"ERROR: solidification failed for {rel_script} (rc={rc})")
+            os.chdir(CURRENT_DIR)
+            env.Exit(rc)
+
+    os.chdir(CURRENT_DIR)
+
+# ---------------------------------------------------------------------------
+# Step 2 - run `coc` to generate the precompiled Berry structures
+# ---------------------------------------------------------------------------
+
 os.chdir(BERRY_GEN_DIR)
 fileList = glob.glob(join(BERRY_GEN_DIR, "generate", "*"))
 for filePath in fileList:
diff --git a/pio-tools/solidify-from-url.py b/pio-tools/solidify-from-url.py
index c5c2fd4bf..1c6fcbc9e 100644
--- a/pio-tools/solidify-from-url.py
+++ b/pio-tools/solidify-from-url.py
@@ -140,7 +140,7 @@ cleanFolder() # always clean up this folder
 try:
     files = env.GetProjectOption("custom_berry_solidify")
 except:
-    print("Nothing more to solidify")
+    pass  # no custom Berry files to solidify - common case, no need to log
 else:
     if env.IsCleanTarget() == False:
         BERRY_EXECUTABLE = ensureBerry()