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
news.html
+33 -11
View File
@@ -377,12 +377,34 @@
<!-- BEFORE: 1st line of markdown file: news.md -->
<h1 id="for-more-news-try-mastodon">For more news, try mastodon</h1>
<h2 id="please-follow-the-ioccc-on-mastodon">Please follow** the <a href="https://fosstodon.org/@ioccc">IOCCC on Mastodon</a></h2>
<h3 id="please-follow-the-ioccc-on-mastodon">Please follow** the <a href="https://fosstodon.org/@ioccc">IOCCC on Mastodon</a></h3>
<p>We use Mastodon to make minor announcements, in addition announcing
major events such as the opening of a new IOCCC, or who won.</p>
<p>See “<a href="faq.html#try_mastodon">FAQ 6.12: What is Mastodon and why does IOCCC use it?</a>” for more
information on Mastodon.</p>
<h1 id="section">2024-04-20</h1>
<h2 id="section">2024-04-30</h2>
<p>The web site now is viewing by mobile devices such as cell phones
and tablets. Devices with a screen resolution 1024 pixels and
narrower are given a <em>hamburger-style</em> menu icon in place of
drop-down menus at the very top of the page (called the <em>topbar</em>).</p>
<p>Any mobile device with a screen wider than 1024 pixels will need
to <em>press and hold</em> to force the <em>topbar</em> pull-down menu to activate.</p>
<p>We had to introduce the use of JavaScript to activate a <em>hamburger-style</em>
menu icon due to the way mobile device screen touching works. Those
devices without JavaScript (or when JavaScript has been disabled)
will be given a link to a web page that presents the equivalent menu.</p>
<p>Fixed generated HTML files where a link to a local file was invalid.
Previous problems included malformed markdown, the local file was
missing, the local file is generated by make or the entry itself, etc.</p>
<p>The generated HTML files (via <code>bin</code> tools) and other HTML files are
now conform with HTML 5 standards. The <strong>Nu Html Checker</strong> reports
<strong>no error, warnings, nor info</strong> messages.</p>
<p>The *Nu Html Checker<strong> change from <em>2024-04-20</em> is that the HTML
files that are static (not generated <code>bin</code> tools) report </strong>no error,
warnings, nor info** messages, changes involving fixing invalid
links to local files have been corrected, and changes involving the
<em>topbar</em> are now HTML 5 conforming.</p>
<h2 id="section-1">2024-04-20</h2>
<p>Nearly all of the <a href="https://ioccc-src.github.io/temp-test-ioccc/">temp-test-ioccc web site</a>
web site has undergone editorial review. Nearly all <a href="years.html">IOCCC winning entries</a>
compile on modern systems and many have <code>try.sh</code> scripts to help you run them.
@@ -400,10 +422,10 @@ glaring “<em>dancing bears</em>” and other frivolous web features.</p>
where the contents of the <a href="https://ioccc-src.github.io/temp-test-ioccc/">temp-test-ioccc web site</a>
will be merged into the <a href="https://www.ioccc.org/index.html">Official IOCCC web site</a>.</p>
<p>Stay tuned!</p>
<h1 id="section-1">2024-02-29</h1>
<h2 id="section-2">2024-02-29</h2>
<p>We continue to make good progress on web site. In the <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc GitHub repo</a> we have made nearly 4600 changes to date!</p>
<p>All web pages, including this one, are now constructed from markdown files and/or JSON data files using tools found in the <a href="bin/index.html">bin</a> directory.</p>
<h1 id="section-2">2023-05-22</h1>
<h2 id="section-3">2023-05-22</h2>
<p>We have been busy preparing for an important / significant update to this web site. In the <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc GitHub repo</a> we have made nearly 2645 changes to date.</p>
<p>While you are free to look at the <a href="https://github.com/ioccc-src/temp-test-ioccc">temp-test-ioccc GitHub repo</a>,
please <strong>do not link to it</strong> as this repo and related web site will disappear once the main
@@ -459,7 +481,7 @@ that needs urgent fixing.
The <strong>IOCCCMOCK</strong> will us to beta-test the new IOCCC process without putting the hard work of those
who submit real IOCCC entries at risk.</p>
<p>Stay tuned!</p>
<h1 id="section-3">2023-01-30</h1>
<h2 id="section-4">2023-01-30</h2>
<p>We added to the
<a href="status.json">status.json</a> page,
a <em>“status_date”</em> JSON member whose value is the date
@@ -471,7 +493,7 @@ a <em>“latest_news”</em> JSON member whose value is the date
of the most recent news item.</p>
<pre><code> &quot;status_date&quot; : &quot;Mon Jan 30 02:28:44 PST 2023&quot;,
&quot;latest_news&quot; : &quot;Mon Jan 30 02:28:44 PST 2023&quot;</code></pre>
<h1 id="section-4">2022-12-18</h1>
<h2 id="section-5">2022-12-18</h2>
<p>As per the suggestion of <a href="https://fosstodon.org/@Virtaava@home.social">Toni Mikkola</a>
(_<span class="citation" data-cites="Virtaava">@Virtaava</span><span class="citation" data-cites="home.social_">@home.social_</span>) we now maintain a
<a href="status.json">status.json</a> page on this web site.</p>
@@ -489,7 +511,7 @@ The details of such additional JSON members are <em>TBD</em>.</p>
Instead you will have to rely on the additional JSON information
and/or read the <a href="#news">IOCCC news</a>,
and/or follow us on Mastodon via <strong><span class="citation" data-cites="ioccc">@ioccc</span><span class="citation" data-cites="fosstodon.org">@fosstodon.org</span></strong>.</p>
<h1 id="section-5">2022-11-29</h1>
<h2 id="section-6">2022-11-29</h2>
<p>We are plan to abandon our
<a href="https://twitter.com/ioccc">IOCCC Twitter feed</a>
in favor of our new <a href="https://fosstodon.org/@ioccc">IOCCC Mastodon</a> feed.</p>
@@ -524,7 +546,7 @@ is made possible by volunteers,
and those who voluntarily
<a href="https://hub.fosstodon.org/support/">support</a> the cost of their server.</p>
<p>Stay tuned in Mastodon as we update you on our progress towards the next IOCCC!</p>
<h1 id="section-6">2022-11-19</h1>
<h2 id="section-7">2022-11-19</h2>
<p>Source code has been released for version <strong>0.8.1 2022-11-19</strong> of the
<a href="https://github.com/ioccc-src/mkiocccentry">mkiocccentry repo</a>,
a GitHub repo that includes the official iocccsize tool,
@@ -536,13 +558,13 @@ to upload the above mentioned compressed tarball: when the contest is open of co
judges will go through the motions (without judging the content) of an IOCCC:
testing the above mentioned tools and testing the submit server.</p>
<p>We are working on complete rebuild of this web site as well.</p>
<h1 id="section-7">2022-01-15</h1>
<h2 id="section-8">2022-01-15</h2>
<p>Source code has been released for version <strong>0.24 2022-01-15</strong> of the
<a href="https://github.com/ioccc-src/mkiocccentry">mkiocccentry tool</a>,
a tool that is based on, and is containing, the official iocccsize tool,
will form a compressed tarball that a registered IOCCC contestant
will upload to the submit server (when the contest is open of course).</p>
<h1 id="section-8">2021-12-27</h1>
<h2 id="section-9">2021-12-27</h2>
<p><a href="judges.html">The Judges</a>
are continuing to work on re-tooling how we run the IOCCC.
We are writing tools under various repositories our
@@ -551,7 +573,7 @@ We are writing tools under various repositories our
Sorry for the delay, but we think you will appreciate the re-tooling
when it is completed.
Stay tuned!</p>
<h1 id="section-9">2021-10-21</h1>
<h2 id="section-10">2021-10-21</h2>
<p><a href="judges.html">The Judges</a>
are re-tooling how we run the IOCCC.
Our goal is to build a smoother, more rapid process centered around
news.md
+41 -11
View File
@@ -1,6 +1,6 @@
# For more news, try mastodon
## Please follow** the [IOCCC on Mastodon](https://fosstodon.org/@ioccc)
### Please follow** the [IOCCC on Mastodon](https://fosstodon.org/@ioccc)
We use Mastodon to make minor announcements, in addition announcing
major events such as the opening of a new IOCCC, or who won.
@@ -9,7 +9,37 @@ See "[FAQ 6.12: What is Mastodon and why does IOCCC use it?](faq.html#try_mastod
information on Mastodon.
# 2024-04-20
## 2024-04-30
The web site now is viewing by mobile devices such as cell phones
and tablets. Devices with a screen resolution 1024 pixels and
narrower are given a _hamburger-style_ menu icon in place of
drop-down menus at the very top of the page (called the _topbar_).
Any mobile device with a screen wider than 1024 pixels will need
to _press and hold_ to force the _topbar_ pull-down menu to activate.
We had to introduce the use of JavaScript to activate a _hamburger-style_
menu icon due to the way mobile device screen touching works. Those
devices without JavaScript (or when JavaScript has been disabled)
will be given a link to a web page that presents the equivalent menu.
Fixed generated HTML files where a link to a local file was invalid.
Previous problems included malformed markdown, the local file was
missing, the local file is generated by make or the entry itself, etc.
The generated HTML files (via `bin` tools) and other HTML files are
now conform with HTML 5 standards. The **Nu Html Checker** reports
**no error, warnings, nor info** messages.
The *Nu Html Checker** change from _2024-04-20_ is that the HTML
files that are static (not generated `bin` tools) report **no error,
warnings, nor info** messages, changes involving fixing invalid
links to local files have been corrected, and changes involving the
_topbar_ are now HTML 5 conforming.
## 2024-04-20
Nearly all of the [temp-test-ioccc web site](https://ioccc-src.github.io/temp-test-ioccc/)
web site has undergone editorial review. Nearly all [IOCCC winning entries](years.html)
@@ -35,14 +65,14 @@ will be merged into the [Official IOCCC web site](https://www.ioccc.org/index.ht
Stay tuned!
# 2024-02-29
## 2024-02-29
We continue to make good progress on web site. In the [temp-test-ioccc GitHub repo](https://github.com/ioccc-src/temp-test-ioccc) we have made nearly 4600 changes to date!
All web pages, including this one, are now constructed from markdown files and/or JSON data files using tools found in the [bin](bin/index.html) directory.
# 2023-05-22
## 2023-05-22
We have been busy preparing for an important / significant update to this web site. In the [temp-test-ioccc GitHub repo](https://github.com/ioccc-src/temp-test-ioccc) we have made nearly 2645 changes to date.
@@ -110,7 +140,7 @@ who submit real IOCCC entries at risk.
Stay tuned!
# 2023-01-30
## 2023-01-30
We added to the
[status.json](status.json) page,
@@ -129,7 +159,7 @@ of the most recent news item.
```
# 2022-12-18
## 2022-12-18
As per the suggestion of [Toni Mikkola](https://fosstodon.org/@Virtaava@home.social)
(_@Virtaava@home.social_) we now maintain a
@@ -153,7 +183,7 @@ and/or read the [IOCCC news](#news),
and/or follow us on Mastodon via **@ioccc@fosstodon.org**.
# 2022-11-29
## 2022-11-29
We are plan to abandon our
[IOCCC Twitter feed](https://twitter.com/ioccc)
@@ -204,7 +234,7 @@ and those who voluntarily
Stay tuned in Mastodon as we update you on our progress towards the next IOCCC!
# 2022-11-19
## 2022-11-19
Source code has been released for version **0.8.1 2022-11-19** of the
[mkiocccentry repo](https://github.com/ioccc-src/mkiocccentry),
@@ -223,7 +253,7 @@ testing the above mentioned tools and testing the submit server.
We are working on complete rebuild of this web site as well.
# 2022-01-15
## 2022-01-15
Source code has been released for version **0.24 2022-01-15** of the
[mkiocccentry tool](https://github.com/ioccc-src/mkiocccentry),
@@ -231,7 +261,7 @@ a tool that is based on, and is containing, the official iocccsize tool,
will form a compressed tarball that a registered IOCCC contestant
will upload to the submit server (when the contest is open of course).
# 2021-12-27
## 2021-12-27
[The Judges](judges.html)
are continuing to work on re-tooling how we run the IOCCC.
@@ -244,7 +274,7 @@ when it is completed.
Stay tuned!
# 2021-10-21
## 2021-10-21
[The Judges](judges.html)
are re-tooling how we run the IOCCC.
next/guidelines.html
+4 -4
View File
@@ -26,13 +26,13 @@
<!-- -->
<!-- This web page was formed via the tool: bin/gen-status.sh -->
<!-- The main section of this web page came from JSON and other data files -->
<!-- The content of main section of this web page came from: next/guidelines.md -->
<!-- -->
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- !!! Do not modify this web page, instead modify the file: next/guidelines.md !!! -->
<!-- !!! Do not modify this web page, instead modify the file: next/guidelines.md !!! -->
<!-- !!! Do not modify this web page, instead modify the file: next/guidelines.md !!! -->
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<!-- Markdown content was converted into HTML via the tool: bin/md2html.sh -->
next/rules.html
+4 -4
View File
@@ -26,13 +26,13 @@
<!-- -->
<!-- This web page was formed via the tool: bin/gen-status.sh -->
<!-- The main section of this web page came from JSON and other data files -->
<!-- The content of main section of this web page came from: next/rules.md -->
<!-- -->
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- The main section of this web page was generated via the tool: bin/gen-status.sh -->
<!-- !!! Do not modify this web page, instead modify the file: next/rules.md !!! -->
<!-- !!! Do not modify this web page, instead modify the file: next/rules.md !!! -->
<!-- !!! Do not modify this web page, instead modify the file: next/rules.md !!! -->
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<!-- Markdown content was converted into HTML via the tool: bin/md2html.sh -->
status.html
+2 -2
View File
@@ -385,8 +385,8 @@
&quot;no_comment&quot; : &quot;mandatory comment: because comments were removed from the original JSON spec&quot;,
&quot;IOCCC_status_version&quot; : &quot;1.0 2024-03-09&quot;,
&quot;contest_status&quot; : &quot;closed&quot;,
&quot;news_update&quot; : &quot;2024-04-28T06:28:19+00:00&quot;,
&quot;status_update&quot; : &quot;2024-03-31T05:02:06+00:00&quot;
&quot;news_update&quot; : &quot;2024-04-30T22:38:16+00:00&quot;,
&quot;status_update&quot; : &quot;2024-04-30T22:51:32+00:00&quot;
}</code></pre>
<!-- END: next line ends content generated by: bin/status2html.sh -->
status.json
+2 -2
View File
@@ -2,6 +2,6 @@
"no_comment" : "mandatory comment: because comments were removed from the original JSON spec",
"IOCCC_status_version" : "1.0 2024-03-09",
"contest_status" : "closed",
"news_update" : "2024-04-28T06:28:19+00:00",
"status_update" : "2024-03-31T05:02:06+00:00"
"news_update" : "2024-04-30T22:38:16+00:00",
"status_update" : "2024-04-30T22:51:32+00:00"
}