txt2pre: use '—' instead of '—' (to fix feed validation)

[~bandali/bndl.org] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 4eaaf04..24e9f9f 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,37 +1,63 @@
-SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4))
-OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
-STATIC := $(patsubst static/%,out/%, $(filter-out static/GNUmakefile, $(wildcard static/* static/.*)))
-
-all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css out/GNUmakefile $(STATIC)
-
-out/%.html: %.m4 header.html footer.html
-       @mkdir -p $(@D)
-       m4 $< > $@
-out/notes.atom: meta_feed_atom.m4 ; m4 $< > $@
-out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@
-out/GNUmakefile: GNUmakefile ; ln -s $(PWD)/$< $@
-$(STATIC): ; ln -s $(PWD)/static/$(@F) $@
-
-# publications bibliography
-static/publications-partial.html: static/bandali.bib static/bandali-bib-*
-static/publications-partial.html: $(filter-out static/publications-partial.html, $(wildcard static/publications-*))
-static/publications-partial.html:
-       $(MAKE) -C $(@D) $(@F)
-out/publications.html: static/publications-partial.html
-out/bandali-bib.html: static/bandali-bib-partial.html
+# GNUmakefile --- GNU Makefile for building my personal site
+
+# Copyright (c) 2020-2021 bandali
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+
+
+gen = perl txt2pre $(1) < $< > $@
+port := $(if $(port),$(port),8000)
+
+TXT := $(filter-out bandali-pubkey.txt bandali.txt,$(wildcard *.txt))
+OUT := $(patsubst %.txt,%.html,$(TXT))
+OUT := $(patsubst bandali-%.html,%.html,$(OUT))
+FEEDS := notes.atom notes.rss
+NOTES := $\
+libreplanet-2021.txt $\
+fsf-internship-beyond.txt $\
+fsf-internship-intro.txt $\
+bandali-computing.txt $\
+
+TXT_FA := $(filter-out fa/bandali.fa.txt,$(wildcard fa/*.fa.txt))
+OUT_FA := $(patsubst fa/%.fa.txt,fa/%.html,$(TXT_FA))
+OUT_FA := $(patsubst fa/bandali-%.html,fa/%.html,$(OUT_FA))
+FEEDS_FA := fa/notes.atom fa/notes.rss
+NOTES_FA := $\
+fa/fsf-internship-beyond.fa.txt $\
+fa/fsf-internship-intro.fa.txt $\
+fa/bandali-computing.fa.txt $\
+
+all: $(OUT) $(FEEDS) index.html $(OUT_FA) $(FEEDS_FA) fa/index.html
+
+%.html: bandali-%.txt txt2pre; $(gen)
+%.html: %.txt txt2pre; $(gen)
+index.html: bandali.txt txt2pre; $(call gen,--index)
+notes.%: $(NOTES) txt2pre
+       perl txt2pre --index --header --format='$*' > $@
+       for n in $(NOTES); do perl txt2pre --format='$*' < "$$n" >> $@; done
+       perl txt2pre --index --footer --format='$*' >> $@
+
+fa/%.html: fa/bandali-%.fa.txt txt2pre; $(call gen,--lang='fa')
+fa/%.html: fa/%.fa.txt txt2pre; $(call gen,--lang='fa')
+fa/index.html: fa/bandali.fa.txt txt2pre; $(call gen,--lang='fa' --index)
+fa/notes.%: $(NOTES_FA) txt2pre
+       perl txt2pre --lang='fa' --index --header --format='$*' > $@
+       for n in $(NOTES_FA); do perl txt2pre --lang='fa' --format='$*' < "$$n" >> $@; done
+       perl txt2pre --lang='fa' --index --footer --format='$*' >> $@
+

 
 clean:
 
 clean:

-       rm -rf out/
+       rm -f $(OUT) $(OUT_FA) index.html fa/index.html

 
 

-deploy:
-       rsync -avzLP out/ abandali@bndl.org:www/bndl.org/
-       ssh abandali@bndl.org mv www/bndl.org/.htaccess-www www/.htaccess
+serve:
+       python -m http.server $(port) || python -m SimpleHTTPServer $(port)

 
 watch:
        while true; do \
 
 watch:
        while true; do \

-       echo $(SRC) header.html footer.html \
-       static/bandali.bib static/bandali-bib-* static/publications-* \
-       GNUmakefile static/GNUmakefile | \
-       tr " " "\n" | entr -d make; done
+       echo $(TXT) $(TXT_FA) bandali.txt fa/bandali.fa.txt \
+       GNUmakefile txt2pre | tr " " "\n" | entr -d make; done

 
 

-.PHONY: deploy watch
+.PHONY: all clean serve watch