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

Fix hostchk.sh #948

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Fix hostchk.sh #948

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
8105079
Fix hostchk.sh
xexyl Aug 28, 2024
2e52f05
Merge branch 'master' into hostchk-fix
lcn2 Aug 29, 2024
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
6 changes: 6 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Major changes to the IOCCC entry toolkit


## Release 1.5.3 2024-08-28

Fix `hostchk.sh` that was broken with the recent change of `MKIOCCCENTRY_SRC`.
New version for hostchk.sh: `"1.0.2 2024-08-28"`.


## Release 1.5.2 2024-08-28

Remove dependence of `jparse/jsemtblgen.h` on `../iocccsize.h`.
Expand Down
7 changes: 3 additions & 4 deletions test_ioccc/hostchk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ CC="$(type -P cc 2>/dev/null)"
if [[ -z $CC ]]; then
CC="/usr/bin/cc"
fi
export HOSTCHK_VERSION="1.0.1 2023-02-22"
export HOSTCHK_VERSION="1.0.2 2024-08-28"
export USAGE="usage: $0 [-h] [-V] [-v level] [-D dbg_level] [-c cc] [-w work_dir] [-f] [-Z topdir]

-h Print help and exit
Expand Down Expand Up @@ -237,9 +237,8 @@ if [[ -n $F_FLAG ]]; then
#
printf "%s\\n%s\\n" "$(grep '#include.*<.*>' "$TOPDIR"/*.[hc] "$TOPDIR"/dbg/*.[hc] \
"$TOPDIR"/dyn_array/*.[hc] "$TOPDIR"/test_ioccc/*.[ch] "$TOPDIR"/soup/*.[hc] "$TOPDIR"/jparse/*.[hcly] \
"$TOPDIR"/jparse/test_jparse/*.[hc] | grep -F -v '<dbg.h' | grep -F -v '<dyn_array.h>' |
cut -f 2- -d:|sort -u)" "int main(void) { return 0; }" |
"${CC}" -DMKIOCCCENTRY_SRC -x c - -o "$PROG_FILE"
"$TOPDIR"/jparse/test_jparse/*.[hc]|grep -vE '<dbg\.h>|<dyn_array\.h>' |cut -f 2- -d:|sort -u)" "int main(void) { return 0; }" |
"${CC}" -x c - -o "$PROG_FILE"
status="$?"
if [[ $status -ne 0 ]]; then
EXIT_CODE=14 # will exit 14 at the end unless EXIT_CODE is changed later on
Expand Down
Loading