summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-10-02 22:00:59 +0100
committerLeah Rowe <leah@libreboot.org>2023-10-02 22:00:59 +0100
commitd9719cae49791258fe33e7d772aea180c3f2164c (patch)
tree281aa6e23c01592c8815543723a32988e500b9fc
parentcb29c96c74b6985ce3cd7f6f672b1d71a88c6fa6 (diff)
handle/make/file: do multiple project arguments
At the end of the function, this script will now run itself again if there are more arguments. This enables the following: ./handle make file -c project1 project2 project3 Whereas previously, it could only do this: ./handle make file -c project1 Substitude -b and it's the same. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xscript/build/release/src19
-rwxr-xr-xscript/handle/make/file8
2 files changed, 9 insertions, 18 deletions
diff --git a/script/build/release/src b/script/build/release/src
index 736276b4..71b8e111 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -107,21 +107,10 @@ purge_files()
for p in u-boot seabios coreboot; do
x_ ./handle make config -c "${p}"
done
- for p in bios_extract flashrom grub uefitool; do
- x_ ./handle make file -c "${p}"
- done
- for p in "stm32-vserprog" "stm32-vserprog/libopencm3"; do
- x_ ./handle make file -c "util-fw/${p}"
- done
- for p in 32 64; do
- x_ ./handle make file -c "memtest86plus/build${p}"
- done
- for p in "nvmutil" "spkmodem_recv" "e6400-flash-unlock"; do
- x_ make clean -C "util/${p}"
- done
- for p in ${trees_fetch_list}; do
- x_ rm -Rf "${p}/${p}" "${p}"/*/.git*
- done
+ x_ ./handle make file -c bios_extract flashrom grub uefitool \
+ util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \
+ memtest86plus/build* util/* \
+
x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \
*/*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git*
x_ rm -Rf cbutils elf util-fw/rp2040/pico-serprog/build
diff --git a/script/handle/make/file b/script/handle/make/file
index 600b9f3d..3bb8030f 100755
--- a/script/handle/make/file
+++ b/script/handle/make/file
@@ -7,13 +7,14 @@ set -u -e
. "include/err.sh"
-eval "$(setvars "" mode project)"
+eval "$(setvars "" mode project _flag)"
main()
{
while getopts b:c: option
do
- case "${1}" in
+ _flag="${1}"
+ case "${_flag}" in
-b) : ;;
-c) mode="distclean" ;;
*) err "Invalid option" ;;
@@ -25,6 +26,7 @@ main()
handle_dependencies
run_make_command
+ [ $# -gt 0 ] && x_ ./handle make file ${_flag} ${@}
}
handle_dependencies()
@@ -47,7 +49,7 @@ run_make_command()
x_ make -C "${project}" -j$(nproc)
else
x_ make -C "${project}" clean
- make -C "${project}" distclean || :
+ make -C "${project}" distclean 2>/dev/null || :
fi
}