Commit Graph
5725 Commits
Author SHA1 Message Date
Landon Curt Noll fcd016a884 update and improve make help
Added `make entry2csv` and `make csv2entry` to the help list.

Changed the "syntax" if the lines printed by `make help` so
that when one selects the entire line and pastes that line
into the shell, the trailing comment is not seen as a rule,
nor it is executed.

Made other minor formatting changes of `make help`.
2024-07-19 14:41:20 -07:00
Landon Curt Noll bbd09c7e46 Merge pull request #2580 from xexyl/entry-csv-make
Update Makefile for csv2entry and entry2csv
2024-07-19 14:11:13 -07:00
Cody Boone Ferguson 06ceb851e4 More updates for entry2csv and csv2entry
The Makefile rules now have a comment for what they do. The help rule
has not been updated.

The bin/README.md has had some format fixes and some typo fixes as well.
Rebuilt bin/index.html but these two files will have to be checked more
thoroughly later.
2024-07-19 13:45:24 -07:00
Cody Boone Ferguson b18a2dc375 Update Makefile for csv2entry and entry2csv
The variables CSV2ENTRY and ENTRY2CSV have been added for the new rules
that run the new rules, csv2entry and entry2csv, respectively, according
to the log in 097dd49cc7.

The rules have been added to .PHONY (thinking about this quickly I
believe this is correct but if not it can be corrected) but not make
help as I am not sure where in that rule they should be and I am also
not sure what should be said even as a summary. The rules have a comment
for which tool it runs but it also does not have a summary as I am not
sure what it should say and I do not currently have the time to look
into it.

With this commit it is now easier to run these tools for testing and
otherwise.
2024-07-19 08:59:28 -07:00
Landon Curt Noll 097dd49cc7 add tools to manage .entry.json content
Added `bin/csv2entry.sh` VERSION "1.0 2024-07-19".

In `bin/entry2csv.sh` changed VERSION from "1.0.2 2024-07-14"
to "1.0.3 2024-07-19".

The `bin/entry2csv.sh` tool converts all entry `.entry.json` files
into canonicalized `author_wins.csv`, `manifest.csv`, and `year_prize.csv`
CSV files.

The `bin/csv2entry.sh` tool converts `author_wins.csv`, `manifest.csv`,
and `year_prize.csv` (canonicalizing them if needed)  `.entry.json`
files for all entries.

To change the manifest for one or more entries:

```sh
    bin/entry2csv.sh -v 1
    # ((import `manifest.csv` into a spreadsheet tool))
    # ((modify in the spreadsheet tool, the content as needed))
    # ((export the spreadsheet contents, as the CSV file  `manifest.csv`))
    bin/csv2entry.sh -v 1
    make www
``

To change the award for one or more entries:

```sh
    bin/entry2csv.sh -v 1
    # ((import `year_prize.csv` into a spreadsheet tool))
    # ((modify in the spreadsheet tool, the content as needed))
    # ((export the spreadsheet contents, as the CSV file  `year_prize.csv`))
    bin/csv2entry.sh -v 1
    make www
``

To change the authorship of one or more entries:

```sh
    bin/entry2csv.sh -v 1
    # ((import `author_wins.csv` into a spreadsheet tool))
    # ((modify in the spreadsheet tool, the content as needed))
    # ((export the spreadsheet contents, as the CSV file  `author_wins.csv`))
    bin/csv2entry.sh -v 1
    # ((modify winning_entry_set of `author/author_handle.json` files as needed))
    make www
``

Performed `make www` to accomplish the above and to test under macOS.

TODO: Review and improve/expand as needed, changes that were made to `bin/README.md`.

TODO: Remove the `tmp` directory (after saving contents into private storage).
2024-07-19 02:15:18 -07:00
Landon Curt Noll ed866b45e8 format headers
We move `tmp/format-headers.sh` into `bin/format-headers.sh`.

We also add a few missing empty lines to `README.md`.

We add `bin/format-headers.sh` to the `bin/README.md`.

We run `bin/format-headers.sh` to perform the above.

Performed `make www` to accomplish the above and to test under macOS.
2024-07-19 00:18:41 -07:00
Landon Curt Noll 0ae673c24e added UNIX command line quote to bin/README.md 2024-07-18 15:23:30 -07:00
Landon Curt Noll be94c60316 fix how tools check exit codes an entire pipe
We use the `status_codes=("${PIPESTATUS[@]}")` method to
collect all of the bash exit codes from a pipe in one go,
and then test for any failure with `[[ ${status_codes[*]} =~ [1-9] ]]`.

There are other cases where an exit code is obtained,
however in each of those cases only a single exit code
from just one of the commands in the pipe is needed.

In `bin/gen-sitemap.sh` changed VERSION from "1.3.9 2024-06-21"
to "1.3.10 2024-07-18".

In `bin/gen-status.sh` changed VERSION from "1.5.4 2024-07-18"
to "1.5.5 2024-07-18".

Performed `make www` to accomplish the above and to test under macOS.
2024-07-18 15:02:16 -07:00
Landon Curt Noll ef35efc4d3 canonicalize failure :-)
We fix some error messages in a few bin scripts.

Sorry (tm Canada 🇨) for the punny log message.
2024-07-18 13:37:44 -07:00
Landon Curt Noll ad72ca96ea add change that was caught by make www 2024-07-18 12:41:08 -07:00
Landon Curt Noll fffe9797a6 Merge pull request #2579 from xexyl/westley92
Remove non bug bug status in 1992/westley
2024-07-18 12:29:41 -07:00
Cody Boone Ferguson d7fb575f16 Remove non bug bug status in 1992/westley
This 'bug' was not actually a bug but an improper reading of the author's
remarks. Upon another read later on (today) it became clear what
the author was getting at. It is not what happens upon execution but
rather the layout of the code: if the alternate code (the US specific
version) is a one line of 160 characters and your terminal wraps at 80
columns it will spell out (over two lines):

    mainland America

The westley.alt2.c is exactly this. It can be compiled if one has gcc or
a compiler that does not have the limitations of arg types to main()
that clang has by using make alt2 (not make alt as it would fail for
clang but people might want to use the alternate code and in fact the
try.sh script does this) but it has the original limitation that one
needs to have a terminal that wraps at 80 columns (since it has to be
the same length of code). But as that size is not that common nowadays
(and in most cases one would have to resize their window) it's mostly
for show.

Updated manifest, rebuilt .entry.json and index.html.

Updated bugs.md and rebuilt bugs.html.
2024-07-18 12:00:21 -07:00
Landon Curt Noll d72364ed16 Merge pull request #2578 from xexyl/statuses
Make bug statuses in index.html files quotes
2024-07-17 13:00:45 -07:00
Landon Curt Noll 6d7b5348b6 improve FAQ 5.5 and FAQ 6.16
We improve FAQ 5.5 (correcting or updating IOCCC author information)
by adding a generic example on changing author's URL.

Now the "PLEASE HELP us identify proper locations for IOCCC authors"
(that now follows the change of URL example) contains only
generic information about changing the location_code from ZZ to AU.

We remove the indirect reference to author email in FAQ 6.16 as we
do not wish to call out what we previously included in the
`authors.html` page.

This commit modifies that otherwise perfect fine PR #2578.

Performed `make www` to accomplish the above and to test under macOS.
2024-07-17 12:38:14 -07:00
Landon Curt Noll 55a413cd55 Merge remote-tracking branch 'origin/master' into statuses 2024-07-17 12:29:55 -07:00
Landon Curt Noll 43fafd0af6 improve FAQ 5.5 and FAQ 6.16
We improve FAQ 5.5 (correcting or updating IOCCC author information)
by adding a generic example on changing author's URL.

Now the "PLEASE HELP us identify proper locations for IOCCC authors"
(that now follows the change of URL example) contains only
generic information about changing the location_code from ZZ to AU.

We remove the indirect reference to author email in FAQ 6.16 as we
do not wish to call out what we previously included in the
`authors.html` page.

This commit modifies that otherwise perfect fine PR #2578.

Performed `make www` to accomplish the above and to test under macOS.
2024-07-17 12:25:23 -07:00
Landon Curt Noll 291084a0cf Merge pull request #2577 from xexyl/deob-faq
Improve FAQ about providing deobfuscated code
2024-07-17 10:42:57 -07:00
Landon Curt Noll 538c11b639 remove reference author email, clarify make quick_www
We remove an indirect reference to author email in FAQ 6.16.

We also clarify and simplify mention of `make quick_www` in FAQ 5.5.
2024-07-17 10:37:29 -07:00
Cody Boone Ferguson 22e483723c Make bug statuses in index.html files quotes
Instead of code blocks the bug / (mis)features statuses are quoted
rather than in a code block. In the case that there is more than one a
line break was added at the end of all but the last one.

A bug status was renamed to be slightly more correct (maybe more than
one was renamed for the same purpose but at least one was).

The bug statuses in the quotes are now bold to let them stand out
better.
2024-07-17 09:54:33 -07:00
Cody Boone Ferguson 442cbfc664 Improve FAQ about providing deobfuscated code
It is preferable that unobfuscated code is by the author if they have
(and many have done exactly that).

It would also be preferable to include the author or authors of the entry or
entries if at all possible.

This update includes a link to how to find more information about an
author and I think that FAQ was slightly improved as well.
2024-07-17 09:52:09 -07:00
Landon Curt Noll b3311322af Merge pull request #2576 from xexyl/overflow-code-scroll
Add overflow scroll bar to code blocks
2024-07-17 03:17:28 -07:00
Landon Curt Noll 0bc6c3e413 improve markdown references to FAQ entries
We quasi-canonicalized markdown links to FAQ entries.

**IMPORTANT NOTE**: This is a useful step in completing issue #2417.  This commit is consistent with the top level TODO comment requirements.  Nevertheless, this changes made by this commit needs to be examined and in some cases improved.

A link to an FAQ entry is of the form:

```
FAQ on "[the link text](....faq.html#string)"
    FAQ on "[the link text](....faq.html#string)"
```

The "FAQ" is at the start of the line, or in rare cases is preceded only by whitespace.

The reference to the FAQ starts outside of the markdown link with the string **FAQ ON "**.

After the markdown link is a **"** followed by either the end of line or a single punctuation character such as a period or comma.

We reduced the size of "the link text" that refer to an FAQ to at most 3 words.  In some cases the sentence and/or text surrounding the markdown link to a FAQ may need to be further adjusted to better accommodate this new style.

**IMPORTANT NOTE**: References to a FAQ entry are on a separate line.

p.s. When linking to the `faq.html` file itself, we use markdown of the form "`the [IOCCC FAQ](..../faq.html)`" and place the word "the" outside of the "IOCCC FAQ" link text.

Given the above system (and because references to an FAQ entry is on a separate line), the following command shows links to FAQ entries, sorted by FAQ entry "link #name" so that one may evaluate the way a given FAQ entry is referenced:

```sh
find * -name '*.md' -print0 | xargs0 grep -E '^[[:space:]]*FAQ on "' | sed -e 's/^\([^:]*\):\( *FAQ on "[^#]*\)#\([^)]*\)\()".*\)$/#\3\t\1\t\2#\3\4/' | sort
```

The above command shows the value of consistency when it comes to FAQ references.

**NOTE**: There are a few differences on how a given FAQ is references.  That is probably OK as there is NOT an "total mandate" that all references to a given FAQ must have the same "link text" for example.  On the other hand if references to a given FAQ can be identical, that might be helpful.  We are certain that in some contexts the "link text" might need to change.

Should we decide to change the way FAQ are referenced, we will be able to modify identify and modify them with greater ease.'

Examine the changes made by this commit and adjust and/or improve as needed.

Performed `make www` to accomplish the above and to test under macOS.
2024-07-17 03:11:19 -07:00
Landon Curt Noll d852734d98 fix faq link URLs what used faq numbers 2024-07-16 22:55:52 -07:00
Cody Boone Ferguson 82f7c2ccc9 Add overflow scroll bar to code blocks
This solves a problem with smaller screens where the code would wrap to
the next line which ruins the formatting of the code on smaller devices.
A downside to this is that it makes it not fit on the screen but since
it technically did not fit on the screen before and this way line breaks
are not added this seems a much better way. It also will mean we
shouldn't need to try and fix all the other long lines in code blocks
(which not only can be problematic but in some cases it can be wrong -
plus it is taking too much time away from moving from entry to the next
entry to the next entry).
2024-07-16 05:50:30 -07:00
Landon Curt Noll b27e07c27e Merge pull request #2574 from xexyl/guidelines-typo 2024-07-15 18:26:53 -07:00
Landon Curt Noll ee51c9ea55 Merge pull request #2573 from xexyl/sdl-faq-var-mk 2024-07-15 18:26:38 -07:00
Cody Boone Ferguson bde801fe60 Typo fix in guidelines (book title) 2024-07-15 16:03:28 -07:00
Landon Curt Noll 5371a515d3 update that make www would have applied 2024-07-15 16:01:59 -07:00
Cody Boone Ferguson dfd65032bb Fix title and link to SDL FAQ in var.mk
The link, for now, refers to the GitHub repo html file
(https://ioccc-src.github.io/temp-test-ioccc/faq.html#SDL) instead of
what it will be later, https://www.ioccc.org/faq.html#SDL.

The title has been changed to not refer to which FAQ (number) it is,
instead saying 'the FAQ on how to compile and use IOCCC entries that
require SDL1 or SDL1'.
2024-07-15 15:56:37 -07:00
Landon Curt Noll 8cd567e700 Merge pull request #2572 from xexyl/otterness-unob
Add unobfuscated alt code to 2020/otterness
2024-07-15 15:35:44 -07:00
Landon Curt Noll 3e9f3d5dc3 Merge pull request #2571 from xexyl/otterness
Update url and alt_url of Nathan Otterness
2024-07-15 15:30:33 -07:00
Landon Curt Noll 2883f339be reapply commit a6458d125f 2024-07-15 15:26:18 -07:00
Landon Curt Noll a815874caa remove trailing space from inc/header.no-header-2.html 2024-07-15 14:50:53 -07:00
Landon Curt Noll 31868158ea improve the result of pr 2570
We improve the language in `SECURITY.md` and the resulting
`SECURITY.html` page, and add an important disclaimer.  We also add
that same disclaimer to the bottom of the of the main `index.html`
we page (via `index.md`).
2024-07-15 14:25:04 -07:00
Landon Curt Noll a527bec63d Merge pull request #2570 from xexyl/link-security-html
Link in SECURITY.html to all web pages
2024-07-15 13:51:34 -07:00
Cody Boone Ferguson 94bdb2c1d8 Add unobfuscated alt code to 2020/otterness
This code was found on the author's web page about the entry and has
been added as prog.alt.c. I added the try.alt.sh script as well.

Manifest updated and rebuilt .entry.json and index.html files.
2024-07-15 10:46:22 -07:00
Cody Boone Ferguson 12320c548d Update url and alt_url of Nathan Otterness
The previous url was the GitHub url but he has his own domain. The
alt_url is his article about the winning entry of his (of course if he
wanted something different he could do that but it's a good enough guess
for now).
2024-07-15 10:00:06 -07:00
Cody Boone Ferguson 009e1b7522 Link in SECURITY.html to all web pages
The location of the link is in the About menu under the 'Contacting the
IOCCC' and above 'Thanks for the help'. At first I had it at the very
bottom, under 'IOCCC markdown guidelines', but it seemed better to have
it closer to contacting the IOCCC. This is the same location in the no
JavaScript menu (which, for those who do not know or forget, is not a
requirement except for some screen sizes).

The top level Makefile has a new 'security' rule. Updated make help.

Typo fixes in make help.

SECURITY.html has had a few updates as well: change the wording of entry
code is unsupported (it now says 'ALL CODE IN ALL IOCCC ENTRIES IS
UNSUPPORTED!!') and it now links to the mkiocccentry repo and how to
report a possible security vulnerability in that repo; as that IS
supported - and since there was reference to discussing security
concerns is in SECURITY.html - even though the entries will not receive
security updates - it seemed a good idea to have a link to report such
security issues in the mkiocccentry repo. Perhaps the FAQ needs to be
updated for this too.
2024-07-15 08:55:54 -07:00
Landon Curt Noll a6458d125f remove trailing space from inc/header.default.html
Removed an annoying trailing space from `inc/header.default.html`.

Performed `make www` to complete the above change.
2024-07-14 22:29:05 -07:00
Landon Curt Noll ace37d56d3 improve debug message in bin/entry2csv.sh
Improved the replaced CSV file debug message from `bin/entry2csv.sh`.

Changed  `bin/entry2csv.sh` VERSION from "1.0 2024-07-14"
to "1.0.1 2024-07-14".
2024-07-14 22:26:33 -07:00
Landon Curt Noll eba262d0de Merge pull request #2569 from xexyl/typo-security-md 2024-07-14 17:58:05 -07:00
Landon Curt Noll 00bd6ff028 add bin/entry2csv.sh tool
We add a new `bin/entry2csv.sh` tool VERSION "1.0 2024-07-14"
that will convert entry `.entry.json` files into 3 CSV files
`author_wins.csv`, `manifest.csv`, and `year_prize.csv`.

The `bin/entry2csv.sh` tool uses `bin/manifest.csv.entry.awk`.
The new `bin/manifest.csv.entry.awk` VERSION is "1.0 2024-07-14".

This tool will be used to convert entry `.entry.json` file into
CSV files suitable for importing into a spreadsheet application
for further processing.

TODO: Write the `bin/csv2entry.sh` tool, for a given entry, to
      convert 3 CSV files into that entry's c`.entry.json` file.
2024-07-14 14:46:31 -07:00
Cody Boone Ferguson 641d70df21 Typo fix in SECURITY.md
Also removed what seems to be unnecessary quotes, much along the lines
in some FAQ links (that will be having the quotes removed).

Added SECURITY.md to bin/md2html.cfg and updated bin/gen-top-html.sh to
build SECURITY.html. The configuration can be improved for keywords and
other things and the file is not linked into the website either but
presumably it should be.
2024-07-14 13:50:46 -07:00
Landon Curt Noll 6bdcf158c7 Merge pull request #2568 from xexyl/auth-info-json-faq
Add FAQs about .auth.json and .info.json
2024-07-14 13:26:16 -07:00
Landon Curt Noll 9a5667c4f0 improve the quote about no comment 2024-07-14 13:23:25 -07:00
Landon Curt Noll 386ece032b fix faq.md HTML flaw, improve string and no_comment 2024-07-14 13:15:21 -07:00
Landon Curt Noll 41f8acd3ae test DarkGreen CSS code colour
As a trial, we change the `<pre>..</pre>` and `<code>..</code>`
blocks form "_Indigo_" to "_DarkGreen_".

We needed a colour that was **NOT** on the "_blue_ thru _purple_" colour
range, nor "_red_" that is currently used by links.

We choose "_DarkGreen_" as this is the same colour as the box around
quotes.  Given that `<pre>..</pre>` and `<code>..</code>` text
is unlikely to be confused with a box around a quote, we felt this
was a safe colour to try.
2024-07-14 12:32:23 -07:00
Landon Curt Noll 40209422c0 set FAQ version
We add a FAQ version of "28.0 2024-07-14" to `faq.md`
using a similar form of version strings as `next/rules.md`
and `next/guidelines.md`.

Ran `make faq` to perform and test the above under macOS.
2024-07-14 11:40:31 -07:00
Cody Boone Ferguson d6f2bffd0e Add FAQs about .auth.json and .info.json
These are very detailed as they are very important parts of the
mkiocccentry toolkit. The guidelines will likely refer to these for
those who want to know more details but that is for another commit.
2024-07-14 11:02:19 -07:00
Landon Curt Noll 42f1ab8e0f create SECURITY.md
The security policy is that nothing is supported.
2024-07-13 22:04:24 -07:00