Skip to content

Commit 3c01334

Browse files
Simplify updating of gzipped docs
FossilOrigin-Name: 1e6896e9f3cc22eec0afc60ea41e0cb3ab3834ab4a4d8d5db9e613c1ad950e8a
1 parent c6c1698 commit 3c01334

File tree

1 file changed

+56
-60
lines changed

1 file changed

+56
-60
lines changed

Makefile

+56-60
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is part of Solo Forth
44
# http://programandala.net/en.program.solo_forth.html
55

6-
# Last modified: 202010012031.
6+
# Last modified: 202010020102.
77
# See change log at the end of the file.
88

99
# ==============================================================
@@ -813,7 +813,7 @@ backgrounds/current.scr: backgrounds/current.pbm
813813
zip -9 $@ $<
814814

815815
%.gz: %
816-
gzip -9 --force $<
816+
gzip -9 --force --keep $<
817817

818818
%.html: %.adoc
819819
asciidoctor --out-file=$@ $<
@@ -1373,54 +1373,50 @@ oldbackup:
13731373
# https://sites.google.com/site/zxgraph/home/einar-saukas/fonts
13741374
# http://www.worldofspectrum.org/infoseekid.cgi?id=0027130
13751375

1376-
# 2017-07-22: Add DocBook and EPUB experimental versions of the
1377-
# manual.
1376+
# 2017-07-22: Add DocBook and EPUB experimental versions of the manual.
13781377
#
13791378
# 2017-12-05: Don't make a +3DOS 180 KiB boot disk anymore.
13801379
#
13811380
# 2017-12-07: Fix rule of +3DOS boot disk.
13821381
#
1383-
# 2018-02-27: Move editors from the library disk to the games disk and
1384-
# rename it, because the library didn't fit a TR-DOS disk image.
1382+
# 2018-02-27: Move editors from the library disk to the games disk and rename
1383+
# it, because the library didn't fit a TR-DOS disk image.
13851384
#
1386-
# 2018-03-10: Add `not_ready` to exclude modules under development.
1387-
# Needed for <src/lib/meta.test.forth2012-test-suite.fs>, which is
1388-
# being adapted.
1385+
# 2018-03-10: Add `not_ready` to exclude modules under development. Needed for
1386+
# <src/lib/meta.test.forth2012-test-suite.fs>, which is being adapted.
13891387
#
1390-
# 2018-04-05: Remove the old code that made the disks containing also
1391-
# the library. Fix name of TR-DOS disk 1.
1388+
# 2018-04-05: Remove the old code that made the disks containing also the
1389+
# library. Fix name of TR-DOS disk 1.
13921390
#
1393-
# 2018-04-07: Update after the renaming of program modules (games,
1394-
# block editors and `edit-sound`).
1391+
# 2018-04-07: Update after the renaming of program modules (games, block
1392+
# editors and `edit-sound`).
13951393
#
1396-
# 2018-04-10: Replace `htmldoc` with `asciidoctor-pdf` for making the
1397-
# PDF versions of the manual.
1394+
# 2018-04-10: Replace `htmldoc` with `asciidoctor-pdf` for making the PDF
1395+
# versions of the manual.
13981396
#
13991397
# 2018-04-11: Create gzipped PDF.
14001398
#
1401-
# 2018-04-17: Link the Forth words of the manual to the glossary,
1402-
# using the new `--annex` option of Glosara. Fix: make the +3DOS and
1403-
# TR-DOS manuals depend also on the Z80 flags notation document.
1399+
# 2018-04-17: Link the Forth words of the manual to the glossary, using the new
1400+
# `--annex` option of Glosara. Fix: make the +3DOS and TR-DOS manuals depend
1401+
# also on the Z80 flags notation document.
14041402
#
14051403
# 2018-06-04: Split the TR-DOS library into two disks.
14061404
#
14071405
# 2018-06-10: Rename TR-DOS phony recipes.
14081406
#
14091407
# 2018-06-12: Add taptools to the list of requirements.
14101408
#
1411-
# 2018-06-15: Prepare the list of exception codes that will be
1412-
# included in the manual.
1409+
# 2018-06-15: Prepare the list of exception codes that will be included in the
1410+
# manual.
14131411
#
14141412
# 2018-06-16: Finish the exception codes lists.
14151413
#
1416-
# 2018-07-20: Convert exception codes into tables instead of
1417-
# definition lists.
1414+
# 2018-07-20: Convert exception codes into tables instead of definition lists.
14181415
#
1419-
# 2018-07-21: Add `--attribute DOS` to Asciidoctor commands, to build
1420-
# the manuals using Asciidoctor's conditional preprocessor directives.
1421-
# Add `[%autowidth] to the tables of exception codes. Set an
1422-
# Asciidoctor attribute "dosname" instead of replacing the "%DOS%"
1423-
# mark with `sed`.
1416+
# 2018-07-21: Add `--attribute DOS` to Asciidoctor commands, to build the
1417+
# manuals using Asciidoctor's conditional preprocessor directives. Add
1418+
# `[%autowidth] to the tables of exception codes. Set an Asciidoctor attribute
1419+
# "dosname" instead of replacing the "%DOS%" mark with `sed`.
14241420
#
14251421
# 2018-07-22: Add a header to the tables of exception codes.
14261422
#
@@ -1430,59 +1426,59 @@ oldbackup:
14301426
#
14311427
# 2020-02-28: Add the _Z80 instructions_ annex to the manual.
14321428
#
1433-
# 2020-02-29: Make the zip and gzip rules common to all cases.
1434-
# Generalize the interface to build the manual in any format for any
1435-
# DOS. Split the long command lines by parameters. Get the Solo Forth
1436-
# version only once, store it in a variable and pass it to Asciidoctor
1437-
# as a parameter, instead of replacing a markup in the source file.
1438-
# Add Vim folding markers. Build PDF also with Pandoc (and wkhtmltopdf
1439-
# as PDF-engine). Build also a ODT version of the manuals.
1429+
# 2020-02-29: Make the zip and gzip rules common to all cases. Generalize the
1430+
# interface to build the manual in any format for any DOS. Split the long
1431+
# command lines by parameters. Get the Solo Forth version only once, store it
1432+
# in a variable and pass it to Asciidoctor as a parameter, instead of replacing
1433+
# a markup in the source file. Add Vim folding markers. Build PDF also with
1434+
# Pandoc (and wkhtmltopdf as PDF-engine). Build also a ODT version of the
1435+
# manuals.
14401436
#
1441-
# 2020-03-01: Build EPUB also with asciidoctor-epub3. Fix prerequites:
1442-
# README and manual skeleton.
1437+
# 2020-03-01: Build EPUB also with asciidoctor-epub3. Fix prerequites: README
1438+
# and manual skeleton.
14431439
#
14441440
# 2020-03-03: Fix prerequisite: exceptions file.
14451441
#
14461442
# 2020-04-03: Replace "docbook" filename extension with "dbk".
14471443
#
1448-
# 2020-04-05: Deprecate the PDF build by Pandoc from HTML. Simplify
1449-
# the filenames of the manuals built by Asciidoctor EPUB3 and
1450-
# Asciidoctor PDF. Fix the building of DocBook (the DOS label
1451-
# attribute was not passed, and the corresponding Asciidoctor
1452-
# conditions failed, making the DOS-spcific contents missing). Dont't
1453-
# build OpenDocument by default. Add rules to build the DocBook
1454-
# directly. Build an HTML manual also with Pandoc.
1444+
# 2020-04-05: Deprecate the PDF build by Pandoc from HTML. Simplify the
1445+
# filenames of the manuals built by Asciidoctor EPUB3 and Asciidoctor PDF. Fix
1446+
# the building of DocBook (the DOS label attribute was not passed, and the
1447+
# corresponding Asciidoctor conditions failed, making the DOS-spcific contents
1448+
# missing). Dont't build OpenDocument by default. Add rules to build the
1449+
# DocBook directly. Build an HTML manual also with Pandoc.
14551450
#
1456-
# 2020-04-06: Split the rules to build EPUB and HTML: one rule for
1457-
# every DOS and converter.
1451+
# 2020-04-06: Split the rules to build EPUB and HTML: one rule for every DOS
1452+
# and converter.
14581453
#
1459-
# 2020-04-13: Add `--epub-chapter-level` to Pandoc, to force the huge
1460-
# glossary XHTML file be splitted in subchapters into the EPUB.
1454+
# 2020-04-13: Add `--epub-chapter-level` to Pandoc, to force the huge glossary
1455+
# XHTML file be splitted in subchapters into the EPUB.
14611456
#
1462-
# 2020-04-17: Test attribute `epub-chapter-level` to Asciidoctor
1463-
# EPUB3, just added to the future version following v0.5.0.alpha.15.
1457+
# 2020-04-17: Test attribute `epub-chapter-level` to Asciidoctor EPUB3, just
1458+
# added to the future version following v0.5.0.alpha.15.
14641459
#
14651460
# 2020-04-27: Add attribute `epub-chapter-level`, after the fixes in
14661461
# Asciidoctor EPUB3 v0.5.0.alpha.17.dev.
14671462
#
1468-
# 2020-05-04: Add the apps to the glossary (actually, only
1469-
# `edit-sound`).
1463+
# 2020-05-04: Add the apps to the glossary (actually, only `edit-sound`).
14701464
#
14711465
# 2020-05-05: Add the editors to the glossary.
14721466
#
14731467
# 2020-06-04: Add the tests to the glossary.
14741468
#
1475-
# 2020-06-17: Save error output of Asciidoctor EPUB3 to log files, to
1476-
# detect wrong cross-references. Add rule "epuba" to build the EPUBs
1477-
# only with Asciidoctor EPUB3.
1469+
# 2020-06-17: Save error output of Asciidoctor EPUB3 to log files, to detect
1470+
# wrong cross-references. Add rule "epuba" to build the EPUBs only with
1471+
# Asciidoctor EPUB3.
1472+
#
1473+
# 2020-07-13: Fix compressed versions of PDF: make gzip keep the input files.
1474+
# Add titles to the exception codes tables.
14781475
#
1479-
# 2020-07-13: Fix compressed versions of PDF: make gzip keep the input
1480-
# files. Add titles to the exception codes tables.
1476+
# 2020-10-01: Compress only with gzip (deactivate zip); remove the uncompressed
1477+
# originals; compress also HTML. Deprecate HTML built from DocBook by Pandoc:
1478+
# the glossary IDs are lost in the process and the links don't work.
14811479
#
1482-
# 2020-10-01: Compress only with gzip (deactivate zip); remove the
1483-
# uncompressed originals; compress also HTML. Deprecate HTML built
1484-
# from DocBook by Pandoc: the glossary IDs are lost in the process and
1485-
# the links don't work.
1480+
# 2020-10-02: Keep the ungzipped originals, e.g. HTML and PDF, in order to make
1481+
# updating faster.
14861482

14871483
# ==============================================================
14881484

0 commit comments

Comments
 (0)