Checkpoint

Author: MATTYGILO

firmware/lockfiles/README.md

@@ -0,0 +1,3 @@
+I This directory holds dependencies.lock.<chip> files generated by CMake via idf_build_set_property.
+It may be empty initially; files will be created during the first successful build.
+

scripts/build_and_check.sh

@@ -2,11 +2,14 @@
 
 set -e
 
+# Determine repository root (one level up from this script's directory)
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
 # Print/speak build completion on exit (whether successful or not)
 function finish {
     echo "Build complete for board ${BOARD}"
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        say "Finished building"
+        say "Finished building" || true
     else
         echo "Build complete"
     fi
@@ -17,14 +20,16 @@ BOARD=${1:-MICROLITE}
 IDF_VERSION=${IDF_VERSION:-v5.4.2}
 
 # Define the absolute path to the micropython folder
-export MICROPYTHON_PATH="$(pwd)/third_party/micropython"
+export MICROPYTHON_PATH="${ROOT_DIR}/third_party/micropython"
 
 # Update submodules required for build
-if [ ! -d third_party/micropython ]; then
-    echo "Micropython submodule missing" >&2
+if [ ! -d "${MICROPYTHON_PATH}" ]; then
+    echo "Micropython submodule missing at ${MICROPYTHON_PATH}" >&2
     exit 1
 fi
 
+pushd "${ROOT_DIR}" >/dev/null
+
 git submodule update --init --recursive
 pushd third_party/micropython >/dev/null
 # ensure required nested submodules
@@ -41,38 +46,58 @@ pushd esp-idf >/dev/null
 popd >/dev/null
 
 # Source esp-idf environment
+# shellcheck disable=SC1091
 source ./esp-idf/export.sh
 
 pip3 install pyelftools
 pip3 install ar
 # Ensure uf2conv.py is importable by setting PYTHONPATH
-export PYTHONPATH="$(pwd)/third_party/micropython/tools${PYTHONPATH:+:$PYTHONPATH}"
+export PYTHONPATH="${MICROPYTHON_PATH}/tools${PYTHONPATH:+:$PYTHONPATH}"
 
 # Build micropython cross compiler
-pushd "$MICROPYTHON_PATH" >/dev/null
+pushd "${MICROPYTHON_PATH}" >/dev/null
 make -C mpy-cross V=1 clean all
 popd >/dev/null
 
 # Build firmware for the selected board
-pushd firmware/boards/${BOARD} >/dev/null
+# We intentionally cd into the board directory so each board keeps an isolated build/ directory.
+# NOTE: Relative references must go back to ROOT_DIR (three levels up from here) not two.
+BOARD_DIR="${ROOT_DIR}/firmware/boards/${BOARD}"
+if [ ! -d "${BOARD_DIR}" ]; then
+    echo "Board directory does not exist: ${BOARD_DIR}" >&2
+    exit 1
+fi
+pushd "${BOARD_DIR}" >/dev/null
 rm -rf build
 
-
 # Inject flags so that:
 #  • C builds drop -Werror=stringop-overflow
 #  • C++ builds retain -fno-rtti
 idf.py clean
-#idf.py build -DCMAKE_C_FLAGS="-Wno-error=stringop-overflow -Wno-stringop-overflow" \
-#              -DCMAKE_CXX_FLAGS="-fno-rtti"
 
+idf.py build \
+    -DMICROPY_BOARD=${BOARD} \
+    -DMICROPY_BOARD_VARIANT=SPIRAM_OCT \
+    -DCMAKE_C_FLAGS="-Wno-error=stringop-overflow -Wno-stringop-overflow" \
+    -DCMAKE_CXX_FLAGS="-fno-rtti" \
+    -DMICROPY_USER_FROZEN_MANIFEST="${MICROPYTHON_PATH}/ports/esp32/boards/manifest.py"
+
+# Assemble unified image (corrected path usage)
+ASSEMBLE_SCRIPT="${ROOT_DIR}/scripts/assemble-unified-image-esp.sh"
+if [ ! -x "${ASSEMBLE_SCRIPT}" ]; then
+    chmod +x "${ASSEMBLE_SCRIPT}" || true
+fi
+if [ ! -f "${ASSEMBLE_SCRIPT}" ]; then
+    echo "Assemble script missing: ${ASSEMBLE_SCRIPT}" >&2
+    exit 1
+fi
 
-#              -DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections -Wl,--print-gc-sections" \
-idf.py build -DMICROPY_BOARD=ESP32_GENERIC_S3 \
-              -DMICROPY_BOARD_VARIANT=SPIRAM_OCT \
-              -DCMAKE_C_FLAGS="-Wno-error=stringop-overflow -Wno-stringop-overflow" \
-              -DCMAKE_CXX_FLAGS="-fno-rtti" \
-              -DMICROPY_USER_FROZEN_MANIFEST="${MICROPYTHON_PATH}/ports/esp32/boards/manifest.py"
+MP_PORTS_PATH="${MICROPYTHON_PATH}/ports/esp32"
+if [ ! -d "${MP_PORTS_PATH}" ]; then
+    echo "Micropython ports directory missing: ${MP_PORTS_PATH}" >&2
+    exit 1
+fi
 
-chmod +x ../../scripts/assemble-unified-image-esp.sh
-../../scripts/assemble-unified-image-esp.sh ../../third_party/micropython/ports/esp32
+"${ASSEMBLE_SCRIPT}" "${MP_PORTS_PATH}"
+popd >/dev/null
 popd >/dev/null