From a507a06076279400625a674bbf6c441af4286e74 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 30 Apr 2024 16:03:42 -0700 Subject: [PATCH] fixed conflict between make gen_status and make gen_top_html 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. --- bin/gen-status.sh | 20 +++++++++++------ news.html | 44 +++++++++++++++++++++++++++---------- news.md | 52 ++++++++++++++++++++++++++++++++++---------- next/guidelines.html | 8 +++---- next/rules.html | 8 +++---- status.html | 4 ++-- status.json | 4 ++-- 7 files changed, 99 insertions(+), 41 deletions(-) diff --git a/bin/gen-status.sh b/bin/gen-status.sh index cea32b5bd..65a7071ba 100755 --- a/bin/gen-status.sh +++ b/bin/gen-status.sh @@ -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 diff --git a/news.html b/news.html index 34885b011..4b948119d 100644 --- a/news.html +++ b/news.html @@ -377,12 +377,34 @@

For more news, try mastodon

-

Please follow** the IOCCC on Mastodon

+

Please follow** the IOCCC on Mastodon

We use Mastodon to make minor announcements, in addition announcing major events such as the opening of a new IOCCC, or who won.

See “FAQ 6.12: What is Mastodon and why does IOCCC use it?” for more 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 web site has undergone editorial review. Nearly all IOCCC winning entries compile on modern systems and many have try.sh scripts to help you run them. @@ -400,10 +422,10 @@ glaring “dancing bears” and other frivolous web features.

where the contents of the temp-test-ioccc web site will be merged into the Official IOCCC web site.

Stay tuned!

-

2024-02-29

+

2024-02-29

We continue to make good progress on web site. In the temp-test-ioccc GitHub repo 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 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 we have made nearly 2645 changes to date.

While you are free to look at the temp-test-ioccc GitHub repo, please do not link to it as this repo and related web site will disappear once the main @@ -459,7 +481,7 @@ that needs urgent fixing. The IOCCCMOCK will us to beta-test the new IOCCC process without putting the hard work of those who submit real IOCCC entries at risk.

Stay tuned!

-

2023-01-30

+

2023-01-30

We added to the status.json page, a “status_date” JSON member whose value is the date @@ -471,7 +493,7 @@ a “latest_news” JSON member whose value is the date of the most recent news item.

    "status_date" : "Mon Jan 30 02:28:44 PST 2023",
     "latest_news" : "Mon Jan 30 02:28:44 PST 2023"
-

2022-12-18

+

2022-12-18

As per the suggestion of Toni Mikkola (_@Virtaava@home.social_) we now maintain a status.json page on this web site.

@@ -489,7 +511,7 @@ The details of such additional JSON members are TBD.

Instead you will have to rely on the additional JSON information and/or read the IOCCC 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 in favor of our new IOCCC Mastodon feed.

@@ -524,7 +546,7 @@ is made possible by volunteers, and those who voluntarily support the cost of their server.

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, 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.

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, 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 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!

-

2021-10-21

+

2021-10-21

The Judges are re-tooling how we run the IOCCC. Our goal is to build a smoother, more rapid process centered around diff --git a/news.md b/news.md index 3fb82cfea..586718644 100644 --- a/news.md +++ b/news.md @@ -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. diff --git a/next/guidelines.html b/next/guidelines.html index ece24ff41..9327f7c81 100644 --- a/next/guidelines.html +++ b/next/guidelines.html @@ -26,13 +26,13 @@ - + - - - + + + diff --git a/next/rules.html b/next/rules.html index 96e03311e..c6629da71 100644 --- a/next/rules.html +++ b/next/rules.html @@ -26,13 +26,13 @@ - + - - - + + + diff --git a/status.html b/status.html index df6f354e3..8c390cd46 100644 --- a/status.html +++ b/status.html @@ -385,8 +385,8 @@ "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" } diff --git a/status.json b/status.json index 2962760a5..0f5bab793 100644 --- a/status.json +++ b/status.json @@ -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" }