From 1ba43a53d6a801f825600a8953f25f30016ae1f4 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:07:17 -0800 Subject: [PATCH 1/6] Fix #15: Stop using emacs to process the html files. Manually expand out @@EMAIL --- cmucl-www/www/credits.html | 21 +++++++++++---------- cmucl-www/www/doc/index.html | 5 +++-- cmucl-www/www/support.html | 15 ++++++++------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/cmucl-www/www/credits.html b/cmucl-www/www/credits.html index d35ec10..479d567 100644 --- a/cmucl-www/www/credits.html +++ b/cmucl-www/www/credits.html @@ -96,7 +96,7 @@ Martin Cracauer - @@EMAIL(cracauer@cons.org) + <cracauer@cons.org> @@ -110,7 +110,7 @@ Peter Van Eynde - @@EMAIL(pvaneynd@debian.org) + <pvaneynd@debian.org> @@ -136,7 +136,7 @@ Rob MacLachlan - @@EMAIL(ram+@CS.cmu.edu) + <ram+@CS.cmu.edu> @@ -144,7 +144,7 @@ Pierre Mai - @@EMAIL(pmai@pmsf.de) + <pmai@pmsf.de> @@ -152,7 +152,7 @@ Eric Marsden - @@EMAIL(emarsden@laas.fr) + <emarsden@laas.fr> @@ -160,7 +160,7 @@ Gerd Moellmann - @@EMAIL(gerd.moellmann@t-online.de) + <gerd.moellmann@t-online.de> @@ -168,7 +168,7 @@ Timothy Moore - @@EMAIL(moore@bricoworks.com) + <moore@bricoworks.com> @@ -194,7 +194,7 @@ Raymond Toy - @@EMAIL(toy.raymond@gmail.com) + <toy.raymond@gmail.com> @@ -202,7 +202,7 @@ Paul Werkowski - @@EMAIL(pw@snoopy.mv.com) + <pw@snoopy.mv.com> @@ -228,7 +228,8 @@ diff --git a/cmucl-www/www/doc/index.html b/cmucl-www/www/doc/index.html index 7f798ec..7236b1c 100644 --- a/cmucl-www/www/doc/index.html +++ b/cmucl-www/www/doc/index.html @@ -193,7 +193,7 @@

Most of these documents are available for convenient download in the EncyCMUCLopedia, which includes an index and short descriptions of each document. Thanks to Paolo - Amoroso @@EMAIL(amoroso@mclink.it).

+ Amoroso <amoroso@mclink.it>.

-->

Tips and tricks @@ -364,7 +364,8 @@
- Last modified: Sun Dec 1 17:08:10 PST 2019 +Last modified: Thu Dec 5 22:05:16 PST 2019 +
diff --git a/cmucl-www/www/support.html b/cmucl-www/www/support.html index c4d4d81..ad4f46e 100644 --- a/cmucl-www/www/support.html +++ b/cmucl-www/www/support.html @@ -69,10 +69,10 @@ list. This mailing list will be moderated when necessary.

- Send email to @@EMAIL(cmucl-announce-request@cons.org) to be + Send email to <cmucl-announce-request@cons.org> to be added or removed from the list (using a subject of subscribe or unsubscribe and an empty body) and - to @@EMAIL(cmucl-announce-human-request@cons.org) in case the + to <cmucl-announce-human-request@cons.org> in case the former doesn't work.

@@ -91,10 +91,10 @@ packages to CMUCL.

- Send email to @@EMAIL(cmucl-imp-request@cmucl.cons.org) to be + Send email to <cmucl-imp-request@cmucl.cons.org> to be added or removed from the list (using a subject of subscribe or unsubscribe and an empty body) and - to @@EMAIL(cmucl-imp-human-request@cons.org) in case the former + to <cmucl-imp-human-request@cons.org> in case the former didn't work.

@@ -129,10 +129,10 @@ on new users.

- Send mail to @@EMAIL(cmucl-help-request@cmucl.cons.org) to be + Send mail to <cmucl-help-request@cmucl.cons.org> to be added or removed from the list (using a subject of subscribe or unsubscribe and an empty body) and - to @@EMAIL(cmucl-help-human-request@cons.org) in case the former + to <cmucl-help-human-request@cons.org> in case the former doesn't work.

@@ -220,7 +220,8 @@ on
- Last modified: Sun Dec 1 17:06:34 PST 2019 +Last modified: Thu Dec 5 22:05:45 PST 2019 +
-- GitLab From 0d2a73833e4220ac30f5a269638e05b9b86b7ea5 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:09:04 -0800 Subject: [PATCH 2/6] Replace @@HOME@@ with the correct path --- cmucl-www/www/news/2001.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmucl-www/www/news/2001.html b/cmucl-www/www/news/2001.html index 171886d..e196aef 100644 --- a/cmucl-www/www/news/2001.html +++ b/cmucl-www/www/news/2001.html @@ -110,7 +110,7 @@ 2001-06-19
- Beginnings of a FAQ. + Beginnings of a FAQ.
2001-06-17 @@ -220,7 +220,8 @@ o Add support for printing various notes during disassembly:
- Last modified: Sun Dec 1 17:09:09 PST 2019 +Last modified: Thu Dec 5 22:07:57 PST 2019 +
-- GitLab From 7b8238f91ea39ff6f8bd618108e1efe5dbb1f0d7 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:14:27 -0800 Subject: [PATCH 3/6] Replace @@DOC@@ with correct link to EncyCMUCLopedia Was pointing to common-lisp.net which doesn't have a copy anymore. For now let's use some other link. We may want to get a copy and put it back on common-lisp.net at which point we can update this link. --- cmucl-www/www/news/2001.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmucl-www/www/news/2001.html b/cmucl-www/www/news/2001.html index e196aef..0145bdf 100644 --- a/cmucl-www/www/news/2001.html +++ b/cmucl-www/www/news/2001.html @@ -117,7 +117,7 @@
A new version of the EncyCMUCLopedia (compendium of + "https://www.pvv.ntnu.no/~ljosa/doc/encycmuclopedia/">EncyCMUCLopedia (compendium of documents related to CMUCL) has been released.
@@ -220,7 +220,7 @@ o Add support for printing various notes during disassembly:
-Last modified: Thu Dec 5 22:07:57 PST 2019 +Last modified: Thu Dec 5 22:13:10 PST 2019
-- GitLab From aef829a5624f575104f0ffa6430d992244748b0b Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:23:51 -0800 Subject: [PATCH 4/6] Skip emacs processing Just need to copy all of the html files to the gen directory. --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2334160..a272015 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,11 +39,9 @@ site: # don't really want to do this # and only build the site if something changed? script: - # Generate the website. Touch build-el.force to force building. - # I think we should always build everything even if only one file changed. - - touch /tmp/build-el-force - - (cd cmucl-www/www; emacs -batch -q -l ../build.el -f wb-make) - - cp -r public/* gen + # Just need to copy all of the html files to the gen directory + - tar cf - `find . -name '*.html'` | (cd gen; tar xf -) + - ls gen # Generates the texi docs. Only done if some texi file changed so we don't # have to download and build texinfo if nothing changed. -- GitLab From 0f97955ae4bffddbdda6f2d6123af8c41a72e010 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:27:35 -0800 Subject: [PATCH 5/6] Change to correct dir before tarring up files --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a272015..082479b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ site: # and only build the site if something changed? script: # Just need to copy all of the html files to the gen directory - - tar cf - `find . -name '*.html'` | (cd gen; tar xf -) + - (cd cmucl-www/www; tar cf - `find . -name '*.html'` | (cd gen; tar xf -) - ls gen # Generates the texi docs. Only done if some texi file changed so we don't -- GitLab From 8f73b25b5c300917a1fab9d9ac3ce761d7c6e7a6 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Thu, 5 Dec 2019 22:28:43 -0800 Subject: [PATCH 6/6] Fix typo in command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 082479b..261584e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ site: # and only build the site if something changed? script: # Just need to copy all of the html files to the gen directory - - (cd cmucl-www/www; tar cf - `find . -name '*.html'` | (cd gen; tar xf -) + - (cd cmucl-www/www; tar cf - `find . -name '*.html'`) | (cd gen; tar xf -) - ls gen # Generates the texi docs. Only done if some texi file changed so we don't -- GitLab