X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/c0f5d2bd437dc554f08beaf3ad3ac3d836ca7656..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 8e644e8..df6cbe5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,103 @@
-all: sitemap.xml data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl
-more: all data/digraphs-xorg.inc.pl
+all: sitemap.xml light.css plan.plp UPDATE data cache
 
-download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInfo.txt data/browser/caniuse data/browser/usage-wm.tsv data/xcolors
-.PHONY: download
+.PHONY: force # applied to download after 2 hours
+download := $(shell [ -z $$(find data/download -mmin -120) ] && (touch data/download && echo force))
+
+# atomically create file by command
+cmdsave = @echo '$1' $2 \>$@; mispipe '$1 $2' 'ifne sponge $@'
+# download git checkout
+gitsave = @if cd $@ 2>/dev/null; \
+	then echo git pull $@; git pull -q --ff-only || true; \
+	else echo git clone $1 $@; git clone -q --progress $1 $@; fi
 
 sitemap.xml: tools/mksitemap
-	$< >$@
+	$(call cmdsave,$<)
+
+light.css: tools/stripcss base.css
+	$(call cmdsave,$^)
+
+plan.plp: TODO
+	kramdown $< >$@
+
+UPDATE: $(download)
+	$(call cmdsave,git log -1 --date=short --pretty="%ad	%s")
 
-data/DerivedAge.txt:
+cache: $(patsubst %.inc.pl,data/%.json,$(wildcard charset-*.inc.pl) $(wildcard keyboard/altgr/*.inc.pl) writing-latn.inc.pl)
+word: word/put.min.js data/wordlist.en.json data/wordlist.nl.json data/wordlist.ru.json data/wordpairs.json
+
+word/put.js: $(download)
+	tools/wget-ifmodified https://github.com/kriszyp/put-selector/raw/master/put.js $@
+word/%.min.js: word/%.js
+	uglifyjs -m '' $< -o $@
+
+data: data/digraphs.json data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.json data/unicode-sampler word
+
+data/DerivedAge.txt: $(download)
 	tools/wget-ifmodified http://www.unicode.org/Public/UNIDATA/$(@F) $@
 
 data/unicode-age.inc.pl: tools/mkcharver data/DerivedAge.txt
-	$< $(word 2,$^) >$@
+	$(call cmdsave,$^)
 
-data/rfc1345.txt:
+data/rfc1345.txt: $(download)
 	tools/wget-ifmodified http://www.ietf.org/rfc/$(@F) $@
 
 data/digraphs-rfc.inc.pl: tools/mkdigraphs-rfc data/rfc1345.txt
-	$< $(word 2,$^) >$@
+	$(call cmdsave,$^)
 
 data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
-	$< $(word 2,$^) >$@
-
-data/xorg-compose:
-	tools/wget-ifmodified http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre $@
+	$(call cmdsave,$^)
 
-data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose
-	$< $(word 2,$^) >$@
+data/xorg-compose: $(download)
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/lib/libx11/-/raw/master/nls/en_US.UTF-8/Compose.pre $@
+data/keysymdef.h: $(download)
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/proto/xorgproto/-/raw/master/include/X11/$(@F) $@
+data/keysymdef.json: tools/mkxkeysymdef data/keysymdef.h
+	$(call cmdsave,$^)
+data/digraphs-xorg.json: tools/mkdigraphs-xorg data/xorg-compose data/keysymdef.json
+	$(call cmdsave,$^)
 
 data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
-	$< >$@
+	$(call cmdsave,$<)
 
-data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
-	$< >$@
+data/digraphs-plan9.txt:
+	tools/wget-ifmodified https://9fans.github.io/usr/local/plan9/lib/keyboard $@
+data/digraphs-plan9.inc.pl: tools/mkdigraphs-plan9 data/digraphs-plan9.txt
+	$(call cmdsave,$^)
+
+data/digraphs.json: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
+	$(call cmdsave,$<)
 
 data/unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl data/unicode-age.inc.pl unicode-table.inc.pl
-	$< >$@
+	$(call cmdsave,$<)
+
+data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf #TODO ttc
+	$(call cmdsave,$^) || true
 
-data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf
-	$< $(word 2,$^) $@ || true
+data/unicode-sampler: $(download)
+	$(call gitsave,git://git.shiar.nl/unicode-sampler)
 
 data/xcolors/themes: data/xcolors
-data/xcolors:
-	[ -r $@/.git ] && cd $@ && git pull --ff-only
-	@[ -e $@ ] || git clone https://github.com/tlatsas/xcolors $@
+data/xcolors: $(download)
+	$(call gitsave,https://github.com/tlatsas/xcolors)
 
 data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
-	$< $(word 2,$^)/* >$@
+	$(call cmdsave,$^/*)
+
+data/wordlist.version.txt: force
+	@[ -e $@ ] || date -Is >$@
+	tools/lastword $@ || true
+
+data/wordlist.%.inc.pl: tools/mkwordlist data/wordlist.version.txt
+	$(call cmdsave,$< $*)
+data/word%.json: data/word%.inc.pl
+	$(call cmdsave,tools/mkjson $<)
+data/%.json: %.inc.pl
+	$(call cmdsave,tools/mkjson $<)
 
-.SECONDARY:
+data/wordpairs.inc.pl: data/wordlist.version.txt
+	tools/wordpairs >$@
+
+.SECONDARY: data/font/%.ttf
 data/font/%.ttf:
 	find /usr/share/fonts/truetype/ ~/.fonts/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
 data/font/%.win2k.ttf:
@@ -62,7 +111,7 @@ data/font/droidserif.ttf:
 data/font/free%.ttf:
 	find /usr/share/fonts/truetype/freefont/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
 data/font/roboto.ttf:
-	ln -sf /usr/share/fonts/truetype/roboto/Roboto-Regular.ttf $@
+	ln -sf /usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Regular.ttf $@
 data/font/noto%.ttf:
 	find /usr/share/fonts/truetype/noto/ -iname "Noto$(*F)-Regular.ttf" | head -1 | xargs -i ln -sf {} $@
 
@@ -81,33 +130,33 @@ data/font/all-other: data/font/unifont.inc.pl data/font/code2000.inc.pl data/fon
 #	$< unifont.ttf $@
 #	$< --headless unifont_upper.ttf >>$@
 
-data/unicode-cover.inc.pl: tools/mkfontinfo data/font $(patsubst data/font/%.ttf,data/font/%.inc.pl,$(wildcard data/font/*.ttf))
-	$< >$@
+data/unicode-cover.inc.pl: tools/mkfontinfo data/font # $(wildcard data/font/*.inc.pl)
+	$(call cmdsave,$<)
 
-data/countryInfo.txt:
+data/countryInfo.txt: $(download)
 	tools/wget-ifmodified http://download.geonames.org/export/dump/$(@F) $@
 
 data/countries.inc.pl: tools/mkcountries-geonames data/countryInfo.txt
-	$< $(word 2,$^) >$@
+	$(call cmdsave,$^)
 
 data/browser: data/browser/support.inc.pl data/browser/usage-wm.inc.pl
 
+data/browser/caniuse/fulldata-json/data-2.0.json: data/browser/caniuse
 data/browser/caniuse/data.json: data/browser/caniuse
-data/browser/caniuse:
-	[ -r $@/.git ] && cd $@ && git pull --ff-only
-	@[ -e $@ ] || git clone https://github.com/Fyrd/caniuse.git $@
+data/browser/caniuse: $(download)
+	$(call gitsave,https://github.com/Fyrd/caniuse.git)
 
-data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/data.json
-	$< $(word 2,$^) >$@
+data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/fulldata-json/data-2.0.json
+	$(call cmdsave,$^)
 
-data/browser/usage-wm.tsv:
+data/browser/usage-wm.tsv: $(download)
 	tools/wget-ifmodified https://analytics.wikimedia.org/datasets/periodic/reports/metrics/browser/all_sites_by_browser_family_and_major_percent.tsv $@
 
 data/browser/usage-wm.inc.pl: tools/mkusage-wikimedia data/browser/usage-wm.tsv
-	$< $(word 2,$^) >$@
+	$(call cmdsave,$^)
 
 clean:
-	-rm data/digraphs.inc.pl
+	-rm data/digraphs.json
 	-rm data/unicode-char.inc.pl
 	-rm data/unicode-age.inc.pl
 	-rm -rf data/font/
@@ -115,8 +164,3 @@ clean:
 	-rm data/browser/support.inc.pl
 	-rm data/browser/usage-wm.inc.pl
 
-.SECONDEXPANSION:
-
-data/writing-latn.inc.pl: $$(@F)
-	perl -MData::Dumper -wE 'my @t = do "$<" or die $$@; print Data::Dumper->new([\@t])->Terse(1)->Quotekeys(0)->Indent(1)->Dump' >$@
-