mirror/ioccc
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict between make gen_status and make gen_top_html

Browse Source 
The `bin/gen-status.sh` will report that the given markdown file
(`next/rules.md` or `next/guidelines.md`) is the source of the
generated HTML file.  This is so that the HTML produced by either
`make gen_status` or `make gen_top_html` will generated the same
HTML comments.  Moreover the comments in `next/rules.html` and
`next/guidelines.html` refer to the markdown file as the source of
the information instead of a tool such as `bin/gen-status.sh`.

Changed `bin/gen-status.sh` VERSION from "1.5.1 2024-04-28"
to "1.5.2 2024-04-30".

Added news for 2024-04-30 into `news.md`.

Make news dates "less shouty".

Ran `make www` to perform the above.
This commit is contained in:
Landon Curt Noll committed 2024-04-30 16:03:42 -07:00
1 parent d09c3fa878
commit a507a06076
7 files changed
+99 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/gen-status.sh
+13 -7
View File
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.5.1 2024-04-28"
export VERSION="1.5.2 2024-04-30"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -1147,18 +1147,21 @@ if [[ -z $NOOP ]]; then
# use the md2html.sh tool to form the rules.html file, unless -n
#
# We force use of "-m next/rules.md" because we want both "make gen_status"
# and "make gen_top_html" to produce the same file content.
#
if [[ $V_FLAG -ge 1 ]]; then
echo "$0: debug[1]: about to run: $MD2HTML_SH ${TOOL_OPTION[*]}" \
"-U $SITE_URL/$RULES_HTML --" \
"-m next/rules.md -U $SITE_URL/$RULES_HTML --" \
"next/rules.md $RULES_HTML" 1>&2
fi
"$MD2HTML_SH" "${TOOL_OPTION[@]}" \
-U "$SITE_URL/$RULES_HTML" -- \
-m next/rules.md -U "$SITE_URL/$RULES_HTML" -- \
next/rules.md "$RULES_HTML"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]}" \
"-U $SITE_URL/$RULES_HTML --" \
"-m next/rules.md -U $SITE_URL/$RULES_HTML --" \
"next/rules.md $RULES_HTML" \
"failed, error: $status" 1>&2
exit 28
@@ -1228,18 +1231,21 @@ if [[ -z $NOOP ]]; then
# use the md2html.sh tool to form the guidelines.html file, unless -n
#
# We force use of "-m next/guidelines.md" because we want both "make gen_status"
# and "make gen_top_html" to produce the same file content.
#
if [[ $V_FLAG -ge 1 ]]; then
echo "$0: debug[1]: about to run: $MD2HTML_SH ${TOOL_OPTION[*]}" \
"-U $SITE_URL/$GUIDELINES_HTML --" \
"-m next/guidelines.md -U $SITE_URL/$GUIDELINES_HTML --" \
"next/guidelines.md $GUIDELINES_HTML" 1>&2
fi
"$MD2HTML_SH" "${TOOL_OPTION[@]}" \
-U "$SITE_URL/$GUIDELINES_HTML" -- \
-m next/guidelines.md -U "$SITE_URL/$GUIDELINES_HTML" -- \
next/guidelines.md "$GUIDELINES_HTML"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]}" \
"-U $SITE_URL/$GUIDELINES_HTML --" \
"-m next/guidelines.md -U $SITE_URL/$GUIDELINES_HTML --" \
"next/guidelines.md $GUIDELINES_HTML" \
"failed, error: $status" 1>&2
exit 32