diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rwxr-xr-x | scripts/mkstatus | 5 | ||||
| -rw-r--r-- | src/luaotfload-main.lua | 9 | ||||
| -rwxr-xr-x | src/luaotfload-tool.lua | 4 | ||||
| -rw-r--r-- | src/luaotfload.sty | 4 |
6 files changed, 25 insertions, 11 deletions
@@ -15,6 +15,7 @@ luaotfload-status.lua filegraph.pdf glyphlist.txt luaotfload-tool.1 +luaotfload.conf.5 luaotfload/* # Files generated by 'make world' and removed by 'make mrproper' @@ -72,6 +72,7 @@ TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) DISTDIR = $(BUILDDIR)/$(NAME) CTAN_ZIPFILE = $(NAME).zip +CTAN_ZIPSIG = $(BUILDDIR)/$(CTAN_ZIPFILE).asc TDS_ZIPFILE = $(NAME).tds.zip CTAN_ZIP = $(BUILDDIR)/$(CTAN_ZIPFILE) TDS_ZIP = $(BUILDDIR)/$(TDS_ZIPFILE) @@ -138,7 +139,7 @@ $(BUILDDIR): /dev/null mkdir -p $(BUILDDIR) define make-ctandir -@$(RM) -rf $(DISTDIR) +@$(RM) -rf -- $(DISTDIR) @mkdir -p $(DISTDIR) && cp $(RESOURCES) $(DOCPDF) $(VGND) $(CONFDEMO) $(SOURCE) $(DISTDIR) endef @@ -148,6 +149,11 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(TDS_ZIP) $(make-ctandir) cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null +$(CTAN_ZIPSIG): $(CTAN_ZIP) + @echo "Signing package $(CTAN_ZIP)" + @$(RM) -- $@ + @gpg --batch --armor --detach-sign "$(CTAN_ZIP)" + define run-install-doc @mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR) @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) @@ -169,7 +175,9 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) check @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null @$(RM) -r -- $(TEXMFROOT) -.PHONY: install manifest clean mrproper show showtargets +sign: $(CTAN_ZIPSIG) + +.PHONY: install manifest clean mrproper show showtargets check install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." @@ -215,6 +223,7 @@ showtargets: @echo @echo " tds package a zipball according to the TDS" @echo " ctan package a zipball for uploading to CTAN" + @echo " sign sign zipball" @echo # vim:noexpandtab:tabstop=8:shiftwidth=2 diff --git a/scripts/mkstatus b/scripts/mkstatus index 15cb97c..802b2cd 100755 --- a/scripts/mkstatus +++ b/scripts/mkstatus @@ -128,7 +128,7 @@ hash_all = function (list, acc) local finfo = list[#list] list[#list] = nil if finfo then - local fpath + local fpath, fname if type (finfo) == "table" then local d, f = finfo [1], finfo [2] if lfs.isdir (d) then @@ -136,6 +136,7 @@ hash_all = function (list, acc) else fpath = f end + fname = f else fpath = finfo end @@ -149,7 +150,7 @@ hash_all = function (list, acc) iowrite (sum) iowrite "\"\n" end - acc[#acc+1] = { fpath, sum } + acc[#acc+1] = { fname, sum } return hash_all (list, acc) end return acc diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index d1cba4c..0d81abb 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -4,7 +4,7 @@ -- REQUIREMENTS: luatex v.0.79 or later; packages lualibs, luatexbase -- AUTHOR: Élie Roux, Khaled Hosny, Philipp Gesang -- VERSION: same as Luaotfload --- MODIFIED: 2014-07-13 15:35:13+0200 +-- MODIFIED: 2014-07-16 19:48:30+0200 ----------------------------------------------------------------------- -- --- Note: @@ -48,11 +48,12 @@ local initial_log_level = 0 luaotfload = luaotfload or { } local luaotfload = luaotfload luaotfload.log = luaotfload.log or { } +luaotfload.version = "2.5-1" -- FIXME version belongs in common init luaotfload.module = { name = "luaotfload-main", - version = 2.50000, - date = "2014/07/13", + version = 2.50001, + date = "2014/07/16", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -100,7 +101,7 @@ luaotfload.log.tex = { --doc]]-- -local min_luatex_version = 76 +local min_luatex_version = 79 if tex.luatexversion < min_luatex_version then warning ("LuaTeX v%.2f is old, v%.2f or later is recommended.", diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua index 4c55508..89f5483 100755 --- a/src/luaotfload-tool.lua +++ b/src/luaotfload-tool.lua @@ -6,11 +6,11 @@ -- AUTHOR: Khaled Hosny, Élie Roux, Philipp Gesang -- VERSION: 2.5 -- LICENSE: GPL v2.0 --- MODIFIED: 2014-05-15 21:47:39+0200 +-- MODIFIED: 2014-07-16 19:45:40+0200 ----------------------------------------------------------------------- luaotfload = luaotfload or { } -local version = "2.5" --- <int: major>.<int: minor>-<int: fixes> +local version = "2.5-1" --- <int: major>.<int: minor>-<int: fixes> luaotfload.version = version luaotfload.self = "luaotfload-tool" diff --git a/src/luaotfload.sty b/src/luaotfload.sty index 9848a22..f09193b 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -38,7 +38,9 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2014/07/13 v2.5 OpenType layout system] + %% FIXME The date is meaningless, we need to find a way to + %% use the git revision instead. + [2014/07/16 v2.5-1 OpenType layout system] \RequirePackage{luatexbase} \fi \RequireLuaModule{luaotfload-main} |