use even more bin/jval-wrapper.sh instead of direct grep of JSON files
We use the `bin/jval-wrapper.sh` tool to obtain information from JSON files instead of attempting using a "GROSS HACK" that involved using `grep(1)` (and friends) as those "GROSS HACK"s assumed that the layout of the JSON was canonical. The `bin/jval-wrapper.sh` tool is able to deal with various layouts of JSON including non-canonical layouts. Moreover, by using the `bin/jval-wrapper.sh` tool we greatly reduce the places in bin tools that contain "GROSS HACK"s. Adjusted `bin/gen-location.sh` to use `bin/jval-wrapper.sh`. Added `-Q` option to `bin/gen-location.sh` to not form `location.html` when the `location.html` file is newer than all `author/author_handle.json` files. Changed `bin/gen-location.sh` VERSION from "1.4.5 2024-08-05" to "1.5 2024-08-15". Performed `make location` to test the above under macOS. Added `make quick_location` rule to the top level `Makefile` to run `bin/gen-location.sh` with `-Q`. Changed `make quick_www` use `make quick_location`. Performed `make quick_location` to test the above under macOS. Performed `make quick_www` to test the above under macOS. Performed `make www` to test the above under macOS.
This commit is contained in:
1 parent
6c37038256
commit
f159369a0a
3 files changed
+349
-196
No files matched your search
@@ -301,7 +301,7 @@ indent.c:
|
||||
# simple want to examine, run / test winning IOCCC entries.
|
||||
|
||||
.PHONY: help genpath genfilelist verify_entry_files gen_authors quick_authors \
|
||||
gen_location gen_years find_missing_links test entry_index gen_top_html \
|
||||
gen_location quick_location gen_years find_missing_links test entry_index gen_top_html \
|
||||
thanks gen_other_html quick_other_html quick_entry_index \
|
||||
gen_year_index quick_www www untar_entry_tarball untar_year_tarball \
|
||||
form_entry_tarball form_year_tarball tar gen_status gen_sitemap \
|
||||
@@ -338,6 +338,7 @@ help:
|
||||
@echo 'make gen_authors ;: generate the top level authors.html page'
|
||||
@echo 'make quick_authors ;: build authors.html if out of date with author JSON files'
|
||||
@echo 'make gen_location ;: generate the top level location.html page'
|
||||
@echo 'make quick_location ;: build location.html if out of date with author JSON files'
|
||||
@echo 'make gen_years ;: generate the top level years.html page'
|
||||
@echo 'make entry_index ;: force the build of ALL winner index.html files'
|
||||
@echo 'make gen_other_html ;: build entry HTML files from markdown other than README.md'
|
||||
@@ -491,6 +492,16 @@ gen_location: ${GEN_LOCATION} location.html
|
||||
${GEN_LOCATION} -v 1
|
||||
@echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-='
|
||||
|
||||
# build location.html if it is out of date from any author/author_handle.json file
|
||||
#
|
||||
# generate the top level location.html page using the
|
||||
# ${GEN_LOCATION} tool (bin/gen-location.sh).
|
||||
#
|
||||
quick_location: ${GEN_LOCATION} location.html
|
||||
@echo '=-=-=-=-= IOCCC begin make $@ =-=-=-=-='
|
||||
${GEN_LOCATION} -v 1 -Q
|
||||
@echo '=-=-=-=-= IOCCC complete make $@ =-=-=-=-='
|
||||
|
||||
# generate the top level years.html page using the ${GEN_YEARS}
|
||||
# tool (bin/gen-years.sh).
|
||||
#
|
||||
@@ -677,7 +688,7 @@ quick_www:
|
||||
${MAKE} genfilelist
|
||||
${MAKE} verify_entry_files
|
||||
${MAKE} quick_authors
|
||||
${MAKE} gen_location
|
||||
${MAKE} quick_location
|
||||
${MAKE} gen_years
|
||||
${MAKE} gen_year_index
|
||||
${MAKE} gen_top_html
|
||||
|
||||
Reference in new issue
Block a user