From bcfe069997ee0002f07ed07fd6c802e2610843ef Mon Sep 17 00:00:00 2001 From: Austin Date: Thu, 11 Dec 2025 20:01:31 -0500 Subject: [PATCH] Optimize builds to reduce duplicate dependency checks (#8943) 'mtjson' will now build all required pieces when they don't exist --- bin/build-esp32.sh | 16 +++------------- bin/build-nrf52.sh | 7 ++----- bin/build-rp2xx0.sh | 7 ++----- bin/build-stm32wl.sh | 7 ++----- bin/platformio-custom.py | 20 +++++++++++--------- bin/platformio-pre.py | 3 +++ 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh index 8c684aa7e..4e799b30a 100755 --- a/bin/build-esp32.sh +++ b/bin/build-esp32.sh @@ -22,7 +22,7 @@ export APP_VERSION=$VERSION basename=firmware-$1-$VERSION -pio run --environment $1 # -v +pio run --environment $1 -t mtjson # -v cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf @@ -32,20 +32,10 @@ cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin echo "Copying ESP32 update bin file" cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin -echo "Building Filesystem for ESP32 targets" -# If you want to build the webui, uncomment the following lines -# pio run --environment $1 -t buildfs -# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin -# # Remove webserver files from the filesystem and rebuild -# ls -l data/static # Diagnostic list of files -# rm -rf data/static -pio run --environment $1 -t buildfs --disable-auto-clean +echo "Copying Filesystem for ESP32 targets" cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin cp bin/device-install.* $OUTDIR/ cp bin/device-update.* $OUTDIR/ -# Generate the manifest file -echo "Generating Meshtastic manifest" -TIMEFORMAT="Generated manifest in %E seconds" -time pio run --environment $1 -t mtjson --silent --disable-auto-clean +echo "Copying manifest" cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json diff --git a/bin/build-nrf52.sh b/bin/build-nrf52.sh index c605fb1e0..e3a421865 100755 --- a/bin/build-nrf52.sh +++ b/bin/build-nrf52.sh @@ -22,7 +22,7 @@ export APP_VERSION=$VERSION basename=firmware-$1-$VERSION -pio run --environment $1 # -v +pio run --environment $1 -t mtjson # -v cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf @@ -47,8 +47,5 @@ if (echo $1 | grep -q "rak4631"); then cp $SRCHEX $OUTDIR/ fi -# Generate the manifest file -echo "Generating Meshtastic manifest" -TIMEFORMAT="Generated manifest in %E seconds" -time pio run --environment $1 -t mtjson --silent --disable-auto-clean +echo "Copying manifest" cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json diff --git a/bin/build-rp2xx0.sh b/bin/build-rp2xx0.sh index ae26fdfbf..3ef1c1e34 100755 --- a/bin/build-rp2xx0.sh +++ b/bin/build-rp2xx0.sh @@ -22,15 +22,12 @@ export APP_VERSION=$VERSION basename=firmware-$1-$VERSION -pio run --environment $1 # -v +pio run --environment $1 -t mtjson # -v cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf echo "Copying uf2 file" cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2 -# Generate the manifest file -echo "Generating Meshtastic manifest" -TIMEFORMAT="Generated manifest in %E seconds" -time pio run --environment $1 -t mtjson --silent --disable-auto-clean +echo "Copying manifest" cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json diff --git a/bin/build-stm32wl.sh b/bin/build-stm32wl.sh index b85da04a6..023f3603c 100755 --- a/bin/build-stm32wl.sh +++ b/bin/build-stm32wl.sh @@ -22,15 +22,12 @@ export APP_VERSION=$VERSION basename=firmware-$1-$VERSION -pio run --environment $1 # -v +pio run --environment $1 -t mtjson # -v cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf echo "Copying STM32 bin file" cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin -# Generate the manifest file -echo "Generating Meshtastic manifest" -TIMEFORMAT="Generated manifest in %E seconds" -time pio run --environment $1 -t mtjson --silent --disable-auto-clean +echo "Copying manifest" cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py index 151cf0a97..3fdbffb70 100644 --- a/bin/platformio-custom.py +++ b/bin/platformio-custom.py @@ -159,20 +159,22 @@ def load_boot_logo(source, target, env): # Load the boot logo on TFT builds if ("HAS_TFT", 1) in env.get("CPPDEFINES", []): - env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo) + env.AddPreAction(f"$BUILD_DIR/{lfsbin}", load_boot_logo) -# Rename (mv) littlefs.bin to include the PROGNAME -# This ensures the littlefs.bin is named consistently with the firmware -env.AddPostAction('$BUILD_DIR/littlefs.bin', env.VerboseAction( - f'mv $BUILD_DIR/littlefs.bin $BUILD_DIR/{lfsbin}', - f'Renaming littlefs.bin to {lfsbin}' -)) +mtjson_deps = ["buildprog"] +if platform.name == "espressif32": + # Build littlefs image as part of mtjson target + # Equivalent to `pio run -t buildfs` + target_lfs = env.DataToBin( + join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR" + ) + mtjson_deps.append(target_lfs) env.AddCustomTarget( name="mtjson", - dependencies=None, + dependencies=mtjson_deps, actions=[manifest_gather], title="Meshtastic Manifest", description="Generating Meshtastic manifest JSON + Checksums", - always_build=True, + always_build=False, ) diff --git a/bin/platformio-pre.py b/bin/platformio-pre.py index 4e51a6544..16278b813 100644 --- a/bin/platformio-pre.py +++ b/bin/platformio-pre.py @@ -11,6 +11,9 @@ else: prefsLoc = env["PROJECT_DIR"] + "/version.properties" verObj = readProps(prefsLoc) env.Replace(PROGNAME=f"firmware-{env.get('PIOENV')}-{verObj['long']}") + env.Replace(ESP32_FS_IMAGE_NAME=f"littlefs-{env.get('PIOENV')}-{verObj['long']}") # Print the new program name for verification print(f"PROGNAME: {env.get('PROGNAME')}") +if platform.name == "espressif32": + print(f"ESP32_FS_IMAGE_NAME: {env.get('ESP32_FS_IMAGE_NAME')}")