✅ Refine parallel builds

Followup to #28447

Author: thinkyhead

buildroot/bin/build_all_examples

@@ -50,7 +50,6 @@ build_all_examples [-a|--archive]         - Copy the binary to the export locati
 }
 
 # Assume the most recent configs
-BRANCH=import-2.1.x
 unset FIRST_CONF
 EXIT_USAGE=
 LIMIT=1000
@@ -99,6 +98,11 @@ shift $((OPTIND - 1))
 
 # Check for mixed continue, skip, resume arguments. Only one should be used.
 ((CONTINUE + CONTSKIP + ISRES + PURGE > 1)) && { echo "Don't mix -c, -p, -s, and -r options" ; echo ; EXIT_USAGE=2 ; }
+[[ -n $BRANCH && -n $CBASE ]] && { echo "Don't mix --branch ($BRANCH) and --base ($CBASE) options" ; echo ; EXIT_USAGE=2 ; }
+
+# Assume import-2.1.x if no --base or --brancs is given.
+# If no --base is supplied, one will be created.
+[[ -z $BRANCH && -z $CBASE ]] && BRANCH=import-2.1.x
 
 # Exit with helpful usage information
 ((EXIT_USAGE)) && { usage ; let EXIT_USAGE-- ; exit $EXIT_USAGE ; }
@@ -162,9 +166,6 @@ export PAUSE=1
 # (not a pipeline subshell) so that exit 1 actually propagates.
 while IFS= read -r -d $'\0' CONF; do
 
-  # Remove the file name and slash from the end of the path
-  CONF=${CONF%/*}
-
   # Get a config's directory name
   DIR=${CONF#$CBASE/config/examples/}
 
@@ -214,8 +215,7 @@ while IFS= read -r -d $'\0' CONF; do
 
   export PAUSE=0
 
-done < <(find "$CBASE"/config/examples -type d -name 'Configuration.h' -o -name 'Configuration_adv.h' -print0 \
-  | LC_ALL=C sort -fz)
+done < <(find "$CBASE/config/examples" \( -name Configuration.h -o -name Configuration_adv.h \) -type f -exec dirname {} \; | LC_ALL=C sort -u)
 
 echo "Exiting"
 

…t/bin/parallel-examples/build_and_log.py buildroot/bin/parallel-build_and_log.pybuildroot/bin/parallel-examples/build_and_log.py renamed to buildroot/bin/parallel-build_and_log.py buildroot/bin/parallel-examples/build_and_log.py renamed to buildroot/bin/parallel-build_and_log.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 """
-parallel_build_test.py — Run config-example loop tests in parallel across Marlin clones.
+parallel_build.py — Run config-example loop tests in parallel across Marlin clones.
 
 Replaces parallel_build_test.sh. Uses argparse and subprocess directly instead
 of shell argument parsing and eval.
 
 Usage:
-    python3 buildroot/bin/parallel_build_test.py [OPTIONS]
+    python3 buildroot/bin/parallel_build.py [OPTIONS]
 
 Options:
     --script=SCRIPT          Loop script to run (default: fix_host_action_configs.py)
@@ -38,7 +38,7 @@
 # ---------------------------------------------------------------------------
 # Defaults
 # ---------------------------------------------------------------------------
-DEFAULT_SCRIPT = "buildroot/bin/fix_host_action_configs.py"
+DEFAULT_SCRIPT = "buildroot/bin/parallel-build_and_log.py"
 DEFAULT_CLONES = 4
 DEFAULT_PREFIX = "marlin-clone"