Skip to content

Make the configure script fail on command failures #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kit-ty-kate wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make the configure script fail on command failures #101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0211a88
Make the configure script fail on command failures
kit-ty-kate Mar 12, 2025
299ea85
Fail early in case either sh or sed are broken
kit-ty-kate Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# ----------------------------------------------------------------------
#

set -e

# Some functions

#set -x
Expand Down Expand Up @@ -567,16 +569,16 @@ if ! check_library unix 'possible since 4.08' unix/unix.cmi unix.cmi; then
exit 1
fi

check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi
check_library bigarray 'possible since 4.08'
check_library compiler-libs '' 'compiler-libs'
check_library dbm 'normal since 4.00'
check_library graphics 'normal since 4.09'
check_library num 'normal since 4.06'
check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma
check_library ocamldoc '' ocamldoc/odoc.cmi
check_library raw_spacetime 'normal since 4.12' raw_spacetime_lib.cmxa
check_library threads '' threads/thread.cmi vmthreads/thread.cmi;
check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi || true
check_library bigarray 'possible since 4.08' || true
check_library compiler-libs '' 'compiler-libs' || true
check_library dbm 'normal since 4.00' || true
check_library graphics 'normal since 4.09' || true
check_library num 'normal since 4.06' || true
check_library ocamlbuild 'normal since 4.03' ocamlbuild/ocamlbuildlib.cma || true
check_library ocamldoc '' ocamldoc/odoc.cmi || true
check_library raw_spacetime 'normal since 4.12' raw_spacetime_lib.cmxa || true
check_library threads '' threads/thread.cmi vmthreads/thread.cmi || true

# Need to know if str and labltk are available for the toolbox
if check_library str 'possible since 4.08' str/str.cmi str.cmi; then
Expand Down Expand Up @@ -702,10 +704,11 @@ done

# create META from META.in in POSIX-compatible & safe way
# see: https://www.shellcheck.net/wiki/SC2044
meta_subst="sed -e 's/@VERSION@/$version/g' \
-e 's/@REQUIRES@/${req_bytes}/g' \
\"\$1\" > \"\${1%.in}\""
find src -name 'META.in' -type f -exec sh -c "$meta_subst" sh {} \;
find src -name 'META.in' -type f | while read -r file; do
sed -e "s/@VERSION@/$version/g" \
-e "s/@REQUIRES@/${req_bytes}/g" \
"$file" > "${file%.in}"
done

######################################################################

Expand Down