Skip to content
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

Pass stderr through calc_install_files when commands fail #709

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pass stderr through calc_install_files when commands fail #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85e940d
Pass stderr through calc_install_files when commands fail
JasonGross Aug 22, 2023
5db3b09
Use log files instead of re-running commands in calc_install_files
JasonGross Aug 29, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ coqide
*~
*#
.#*
.*.log
*.aux
doc/html/
/_CoqProject
Expand Down
10 changes: 7 additions & 3 deletions util/calc_install_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# The $1 argument of this script should be the desired make target

MAKE=${MAKE:-make}
${MAKE} depend >& /dev/null
${MAKE} CLIGHTGEN="CLIGHTGEN" -Bn veric floyd $1 2>/dev/null | \
awk '/^echo COQC /{print $NF}/^CLIGHTGEN/{print $NF}'
LOG_DEPEND_FILE=${LOG_DEPEND_FILE:-.calc_install_files.depend.log}
LOG_MAKE_FILE=${LOG_MAKE_FILE:-.calc_install_files.make.log}
${MAKE} depend >& "${LOG_DEPEND_FILE}" || \
{ printf "Error in %s: %s\n" "$0" "${MAKE} depend"; cat "${LOG_DEPEND_FILE}"; } >&2
{ ${MAKE} CLIGHTGEN="CLIGHTGEN" -Bn veric floyd $1 2>"${LOG_MAKE_FILE}" || \
{ printf "Error in %s: %s\n" "$0" "${MAKE} CLIGHTGEN=\"CLIGHTGEN\" -Bn veric floyd $1"; cat "${LOG_MAKE_FILE}"; } >&2; } | \
awk '/^echo COQC /{print $NF}/^CLIGHTGEN/{print $NF}'