diff options
| -rw-r--r-- | Makefile | 58 | ||||
| -rwxr-xr-x | luaotfload-tool.lua | 8 | ||||
| -rw-r--r-- | mkstatus (renamed from mkfilelist) | 10 |
3 files changed, 38 insertions, 38 deletions
@@ -8,9 +8,9 @@ OTFL = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf GLYPHSCRIPT = mkglyphlist GLYPHSOURCE = glyphlist.txt CHARSCRIPT = mkcharacters -FILESCRIPT = mkfilelist +STATUSSCRIPT = mkstatus -RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(FILESCRIPT) +RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) SCRIPTNAME = luaotfload-tool SCRIPT = $(SCRIPTNAME).lua @@ -25,8 +25,8 @@ DOT = $(GRAPH).dot # Files grouped by generation mode GLYPHS = luaotfload-glyphlist.lua CHARS = luaotfload-characters.lua -FILES = luaotfload-files.lua -RESOURCES = $(GLYPHS) $(CHARS) $(FILES) +STATUS = luaotfload-status.lua +RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) GRAPHED = $(DOTPDF) MAN = $(MANPAGE) COMPILED = $(DOC) @@ -36,20 +36,20 @@ SOURCE = $(DTX) $(MANSOURCE) $(OTFL) README Makefile NEWS $(RESOURCESCRIPTS) # test files TESTDIR = tests -TESTFILES = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx) -TESTFILES_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex -TESTFILES_TL = $(filter-out $(TESTFILES_SYS), $(TESTFILES)) +TESTSTATUS = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx) +TESTSTATUS_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex +TESTSTATUS_TL = $(filter-out $(TESTSTATUS_SYS), $(TESTSTATUS)) # Files grouped by installation location -SCRIPTFILES = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) -RUNFILES = $(UNPACKED) $(filter-out $(SCRIPTFILES),$(OTFL)) -DOCFILES = $(DOC) $(DOTPDF) README NEWS -MANFILES = $(MANPAGE) -SRCFILES = $(DTX) Makefile +SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) +RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(OTFL)) +DOCSTATUS = $(DOC) $(DOTPDF) README NEWS +MANSTATUS = $(MANPAGE) +SRCSTATUS = $(DTX) Makefile # The following definitions should be equivalent -# ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES) -ALL_FILES = $(GENERATED) $(SOURCE) +# ALL_STATUS = $(RUNSTATUS) $(DOCSTATUS) $(SRCSTATUS) +ALL_STATUS = $(GENERATED) $(SOURCE) # Installation locations FORMAT = luatex @@ -72,7 +72,7 @@ DO_LATEX = latexmk -pdf -e '$$pdflatex = q(lualatex %O %S)' -silent $< >/dev DO_GRAPHVIZ = dot -Tpdf -o $@ $< > /dev/null DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null -DO_FILES = $(LUA) $(FILESCRIPT) > /dev/null +DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null DO_DOCUTILS = rst2man $< >$@ 2>/dev/null all: $(GENERATED) @@ -82,7 +82,7 @@ manual: $(MAN) unpack: $(UNPACKED) resources: $(RESOURCES) chars: $(CHARS) -filelist: $(FILES) +status: $(STATUS) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) world: all ctan @@ -93,8 +93,8 @@ $(GLYPHS): /dev/null $(CHARS): /dev/null $(DO_CHARS) -$(FILES): /dev/null - $(DO_FILES) +$(STATUS): /dev/null + $(DO_STATUS) $(GRAPHED): $(DOT) $(DO_GRAPHVIZ) @@ -114,15 +114,15 @@ $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP) @zip -9 $@ $^ >/dev/null define run-install -@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTFILES) $(SCRIPTDIR) -@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR) -@mkdir -p $(DOCDIR) && cp $(DOCFILES) $(DOCDIR) -@mkdir -p $(SRCDIR) && cp $(SRCFILES) $(SRCDIR) -@mkdir -p $(MANDIR) && cp $(MANFILES) $(MANDIR) +@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTSTATUS) $(SCRIPTDIR) +@mkdir -p $(RUNDIR) && cp $(RUNSTATUS) $(RUNDIR) +@mkdir -p $(DOCDIR) && cp $(DOCSTATUS) $(DOCDIR) +@mkdir -p $(SRCDIR) && cp $(SRCSTATUS) $(SRCDIR) +@mkdir -p $(MANDIR) && cp $(MANSTATUS) $(MANDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -$(TDS_ZIP): $(ALL_FILES) +$(TDS_ZIP): $(ALL_STATUS) @echo "Making TDS-ready archive $@." @$(RM) -- $@ $(run-install) @@ -131,20 +131,20 @@ $(TDS_ZIP): $(ALL_FILES) .PHONY: install manifest clean mrproper -install: $(ALL_FILES) +install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." $(run-install) -check: $(RUNFILES) $(TESTFILES_TL) +check: $(RUNSTATUS) $(TESTSTATUS_TL) @rm -rf var - @for f in $(TESTFILES_TL); do \ + @for f in $(TESTSTATUS_TL); do \ echo "check: luatex $$f"; \ luatex --interaction=batchmode $$f \ > /dev/null || exit $$?; \ done -check-all: $(TESTFILES_SYS) check - @cd $(TESTDIR); for f in $(TESTFILES_SYS); do \ +check-all: $(TESTSTATUS_SYS) check + @cd $(TESTDIR); for f in $(TESTSTATUS_SYS); do \ echo "check: luatex $$f"; \ $(TESTENV) luatex --interaction=batchmode ../$$f \ > /dev/null || exit $$?; \ diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua index 3010653..79f1c26 100755 --- a/luaotfload-tool.lua +++ b/luaotfload-tool.lua @@ -920,7 +920,7 @@ actions.list = function (job) end do - local hash_list = "luaotfload-files" + local status_file = "luaotfload-status" local out = function (...) logs.names_report (false, 0, "diagnose", ...) @@ -928,15 +928,15 @@ do local verify_files = function (errcnt) out ("Loading file hashes.") - local info = require (hash_list) + local info = require (status_file) local hashes = info.hashes local notes = info.notes if not hashes or #hashes == 0 then - out ("FAILED: cannot read checksums from %s.", hash_list) + out ("FAILED: cannot read checksums from %s.", status_file) return 1/0 elseif not notes then out ("FAILED: cannot read commit metadata from %s.", - hash_list) + status_file) return 1/0 end @@ -1,8 +1,8 @@ #!/usr/bin/env texlua ----------------------------------------------------------------------- --- FILE: mkfilelist.lua --- USAGE: ./mkfilelist.lua --- DESCRIPTION: part of the luaotfload package +-- FILE: mkstatus.lua +-- USAGE: ./mkstatus.lua +-- DESCRIPTION: writes the repository state -- REQUIREMENTS: luatex, the lualibs package -- AUTHOR: Philipp Gesang (Phg), <phg42.2a@gmail.com> -- VERSION: 1.0 @@ -29,7 +29,7 @@ local iopopen = io.popen -- settings ----------------------------------------------------------------------- -local filelist = "luaotfload-files.lua" --- result +local filelist = "luaotfload-status.lua" --- result local names = { --- only the runtime files and scripts @@ -56,8 +56,8 @@ local names = { "luaotfload-tool.lua", "luaotfload-typo-krn.lua", "mkcharacters", - "mkfilelist", "mkglyphlist", + "mkstatus", } ----------------------------------------------------------------------- |