summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore19
-rw-r--r--Makefile35
-rw-r--r--site/posts/meta/Contents.org48
-rw-r--r--site/posts/meta/Soupault.org (renamed from site/posts/SoupaultConfiguration.org)2
4 files changed, 75 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore
index d03deed..6472c52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,17 +11,20 @@ node_modules/
package-lock.json
# begin generated files
-site/posts.html
+site/style/main.css
site/news/ColorlessThemes-0.2.html
-site/posts/Thanks.html
-site/posts/SoupaultConfiguration.html
-site/posts/DiscoveringCommonLisp.html
site/posts/ExtensibleTypeSafeErrorHandling.html
+site/posts/DiscoveringCommonLisp.html
site/posts/MonadTransformers.html
-site/posts/StronglySpecifiedFunctionsProgram.html
-site/posts/MiniHTTPServer.html
-site/posts/StronglySpecifiedFunctions.html
+site/posts/meta/Soupault.html
+site/posts/meta/Contents.html
+site/posts/Thanks.html
+site/posts.html
site/posts/RewritingInCoq.html
+site/posts/StronglySpecifiedFunctions.html
site/posts/Ltac101.html
-site/style/main.css
+site/posts/StronglySpecifiedFunctionsProgram.html
+site/posts/MiniHTTPServer.html
+org.mk
+coq.mk
# begin generated files
diff --git a/Makefile b/Makefile
index c24a187..b8dbffc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,32 @@
SASS := $(shell find site/ -name "*.sass")
-ORG_POSTS := $(shell find site/ -name "*.org")
-COQ_POSTS := $(shell find site/ -name "*.v")
-INPUTS := $(ORG_POSTS:.org=.html) $(COQ_POSTS:.v=.html) $(SASS:.sass=.css)
+INPUTS := $(SASS:.sass=.css)
+MAKEFILES := org.mk coq.mk
-COQCARGS := -async-proofs-cache force -w -custom-entry-overriden
+include ${MAKEFILES}
build: ${INPUTS} soupault.conf
@echo "run soupault"
@soupault
- @scripts/update-gitignore.sh ${INPUTS}
+ @echo "update gitignore"
+ @scripts/update-gitignore.sh ${INPUTS} ${MAKEFILES}
clean:
- rm -f ${INPUTS}
- rm -rf build
+ @echo "remove generated makefiles"
+ @rm -f ${MAKEFILES}
+ @echo "remove generated files in site/"
+ @rm -f ${INPUTS}
+ @echo "remove build/ directory"
+ @rm -rf build
force: clean build
-soupault.conf: site/posts/SoupaultConfiguration.org
+soupault.conf: site/posts/meta/Soupault.org
@echo "generate soupault.conf"
@emacs $< --batch --eval "(org-babel-tangle)" --kill 2>/dev/null
-%.html: %.v
- @echo "export $*.v"
- @coqc ${COQCARGS} $*.v
- @coqdoc --no-index --charset utf8 --short --body-only -d site/posts/ \
- --coqlib "https://coq.inria.fr/distrib/current/stdlib/" \
- $*.v
- @sed -i -e 's/href="$(shell basename $*.html)\#/href="\#/g' $*.html
- @rm -f site/posts/coqdoc.css
-
-%.html: %.org
- @echo "export $*.org"
- @emacs $< --batch --eval "(setq org-html-htmlize-output-type nil)" --eval "(org-html-export-to-html nil nil nil t)" --kill
+org.mk coq.mk &: site/posts/meta/Contents.org
+ @echo "generate org.mk, coq.mk"
+ @emacs $< --batch --eval "(org-babel-tangle)" --kill 2>/dev/null
%.css: %.sass
@echo "compile $*.sass"
diff --git a/site/posts/meta/Contents.org b/site/posts/meta/Contents.org
new file mode 100644
index 0000000..c2e67d7
--- /dev/null
+++ b/site/posts/meta/Contents.org
@@ -0,0 +1,48 @@
+#+BEGIN_EXPORT html
+<h1>Authoring Contents and HTML Generation</h1>
+#+END_EXPORT
+
+* Using Org files
+
+** Author Guidelines
+
+** Generation Process
+
+#+BEGIN_SRC emacs-lisp :tangle ../../../scripts/configure-org.el
+(setq org-html-htmlize-output-type nil)
+(org-html-export-to-html nil nil nil t)
+#+END_SRC
+
+#+BEGIN_SRC makefile :tangle ../../../org.mk
+ORG_POSTS := $(shell find site/ -name "*.org")
+INPUTS += $(ORG_POSTS:.org=.html)
+
+%.html: %.org
+ @echo "export $*.org"
+ @emacs $< \
+ --batch \
+ --load=$(shell pwd)/scripts/configure-org.el \
+ --kill
+#+END_SRC
+
+* Using Coq files
+
+#+BEGIN_SRC makefile :tangle ../../../coq.mk
+COQ_POSTS := $(shell find site/ -name "*.v")
+INPUTS += $(COQ_POSTS:.v=.html)
+
+COQCARGS := -async-proofs-cache force -w -custom-entry-overriden
+
+%.html: %.v
+ @echo "export $*.v"
+ @coqc ${COQCARGS} $*.v
+ @coqdoc --no-index --charset utf8 --short --body-only -d site/posts/ \
+ --coqlib "https://coq.inria.fr/distrib/current/stdlib/" \
+ $*.v
+ @sed -i -e 's/href="$(shell basename $*.html)\#/href="\#/g' $*.html
+ @rm -f site/posts/coqdoc.css
+#+END_SRC
+
+# Local Variables:
+# org-src-preserve-indentation: t
+# End:
diff --git a/site/posts/SoupaultConfiguration.org b/site/posts/meta/Soupault.org
index a2ed313..bbc05c5 100644
--- a/site/posts/SoupaultConfiguration.org
+++ b/site/posts/meta/Soupault.org
@@ -1,7 +1,7 @@
#+BEGIN_EXPORT html
<h1><code>soap.coffee/~lthms</code> Soupault Configuration</h1>
-<div id="history">site/posts/SoupaultConfiguration.org</div>
+<div id="history">site/posts/meta/Soupault.org</div>
#+END_EXPORT
#+BEGIN_SRC toml :tangle ../../soupault.conf