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

Additional fixes and updates to various tools #1195

Merged
merged 1 commit into from
Feb 28, 2025
Merged

Additional fixes and updates to various tools #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ random_answers.*
/test_ioccc/fnamchk
/test_ioccc/.hostchk.*.work/
/test_ioccc/.local.dir.tags
test_ioccc/slot/good/workdir/
/test_ioccc/tags
/test_ioccc/test_JSON/
/test_ioccc/test_ioccc.log
Expand Down
33 changes: 29 additions & 4 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,37 @@ the longer warning to be sure that they know. As for `-Y` it really ought to be
used only for the test script but even `-y` should be used with **EXTREME**
caution.

It is hoped this is the last update to `mkiocccentry(1)` prior to the soft code
freeze today.
Add extra sanity checks in `check_submission_dir()`: it now checks towards the
beginning if the required files exist (that is, the three user submitted files,
not the JSON file as those don't exist yet, though it does check that they do
not exist as dot files here would be an error) and are readable and if they are
not size 0 (for Makefile and remarks.md - prog.c may be empty).

Update `MKIOCCCENTRY_VERSION` to `"1.2.36 2025-02-28"`.
Updated some literal strings of the three required filenames (as above) to their
macros in both mkiocccentry and txzchk.

TODO: finish work on the `chkentry_test.sh` script.
Fixes in `chkentry` with checking if files exist or do not exist (depending on
options) and also add checks for file sizes for certain files, namely Makefile,
remarks.md (in non-winning mode) as well as index.html (in winning mode) and
README.md (in winning mode).

Error messages were improved in `chkentry` as well though there are some places
(the manifest check) where they could be improved (this would require lower
level changes that we do not have time for before the freeze later today).

Sync [jparse repo](https://github.com/xexyl/jparse/) to `jparse/` for new util
function (that uses its `file_size()` function) `is_empty()`. This is used in
the update to `chkentry`.

More work on the `chkentry_test.sh` script. The script is in better shape so
that when the directories are generated (they cannot be static due to version
changes - at least without a new option) the script should hopefully be easily
updated (though it depends maybe on how the new directories are generated).

Updated `MKIOCCCENTRY_VERSION` to `"1.2.36 2025-02-28"`.
Updated `TXZCHK_VERSION` to `"1.1.15 2025-02-28"`.
Updated `CHKENTRY_VERSION` to `"1.1.6 2025-02-28"`.
Updated `CHKENTRY_TEST_VERSION` to `"1.1.1 2025-02-28"`.

Resequence exit codes in `jparse/util.c`. It appears that this was not done or
something went wrong when doing so (as running `make seqcexit` updated the exit
Expand Down
30 changes: 20 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#
# mkiocccentry and related tools - how to form an IOCCC submission
#
# For the mkiocccentry utility:
# For mkiocccentry:
#
# Copyright (c) 2021-2025 by Landon Curt Noll. All Rights Reserved.
# Copyright (c) 2021-2025 by Landon Curt Noll and Cody Boone Ferguson.
# All Rights Reserved.
#
# Permission to use, copy, modify, and distribute this software and
# its documentation for any purpose and without fee is hereby granted,
Expand All @@ -16,17 +17,26 @@
# source works derived from this source
# binaries derived from this source or from derived source
#
# LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
# EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
# AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# chongo (Landon Curt Noll, http://www.isthe.com/chongo/index.html) /\oo/\
# This tool was co-developed in 2021-2025 by Cody Boone Ferguson and Landon
# Curt Noll:
#
# @xexyl
# https://xexyl.net Cody Boone Ferguson
# https://ioccc.xexyl.net
# and:
# chongo (Landon Curt Noll, http://www.isthe.com/chongo/index.html) /\oo/\
#
# "Because sometimes even the IOCCC Judges need some help." :-)
#
# Share and enjoy! :-)
# -- Sirius Cybernetics Corporation Complaints Division, JSON spec department. :-)
####

####
Expand Down
Loading