From 68814e9bc62d8ea1cf3d17a657a23564341cf71c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 21 Jul 2015 00:41:57 +0200 Subject: [build] add rules for import and packaging New targets: $ make import Runs the packaging script in import mode. Also, $ make loader Will package the files in the src/fontloader/* directories into a merged fontloader package using mtx-package. --- Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ab5c464..61e8e49 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ DOCSRCDIR = ./doc SCRIPTSRCDIR = ./scripts SRCSRCDIR = ./src FONTLOADERDIR = $(SRCSRCDIR)/fontloader/runtime +PACKAGEDIR = $(SRCSRCDIR)/fontloader/ BUILDDIR = ./build MISCDIR = ./misc @@ -48,6 +49,7 @@ DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGES) GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua CHARS = $(BUILDDIR)/$(NAME)-characters.lua STATUS = $(BUILDDIR)/$(NAME)-status.lua +LOADER = $(BUILDDIR)/fontloader-$(shell date +%F).lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS) @@ -88,8 +90,9 @@ LUA = texlua ## variables. DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null -DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null -DO_IMPORT = $(LUA) $(IMPORTSCRIPT) > /dev/null +DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null +DO_IMPORT = $(LUA) $(IMPORTSCRIPT) import +DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) define check-lua-files @echo validating syntax @@ -113,8 +116,12 @@ builddir: $(BUILDDIR) resources: $(RESOURCES) chars: $(CHARS) status: $(STATUS) +package: loader +loader: $(LOADER) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) +import: + $(DO_IMPORT) graph: $(DOTPDF) doc: $(DOCS) @@ -139,6 +146,9 @@ $(CHARS): builddir $(STATUS): builddir $(DO_STATUS) +$(LOADER): builddir + $(DO_PACKAGE) + $(BUILDDIR): /dev/null mkdir -p $(BUILDDIR) @@ -222,6 +232,7 @@ showtargets: @echo " luaotfload.conf(5) (requires Docutils)" @echo " graph generate file graph (requires GraphViz)" @echo + @echo " loader merge fontloader" @echo " chars import char-def.lua as luaotfload-characters.lua" @echo " status create repository info (luaotfload-status.lua)" @echo -- cgit v1.2.3 From d6a31eacfaefe016d57c5caaf9ab5e12d3d50618 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 21 Jul 2015 01:20:29 +0200 Subject: [import] automate merge with parameters passed from makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 61e8e49..21909e5 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DOCSRCDIR = ./doc SCRIPTSRCDIR = ./scripts SRCSRCDIR = ./src FONTLOADERDIR = $(SRCSRCDIR)/fontloader/runtime -PACKAGEDIR = $(SRCSRCDIR)/fontloader/ +PACKAGEDIR = $(SRCSRCDIR)/fontloader BUILDDIR = ./build MISCDIR = ./misc -- cgit v1.2.3 From c4ed163680db9a566b29f5f1d8b98a928f8055a0 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 21 Jul 2015 07:39:52 +0200 Subject: [status] allow passing additional files on command line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During a build process, the name of a freshly created fontloader package will be passed to ``mkstatus`` so it’ll be considered in the status file. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 21909e5..f81f544 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,10 @@ LUA = texlua ## variables. DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null -DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null -DO_IMPORT = $(LUA) $(IMPORTSCRIPT) import -DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) +DO_STATUS = $(LUA) $(STATUSSCRIPT) $(LOADER) >/dev/null +DO_IMPORT = $(LUA) $(IMPORTSCRIPT) import >/dev/null +DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package \ + $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) >/dev/null define check-lua-files @echo validating syntax @@ -143,7 +144,7 @@ $(GLYPHS): builddir $(CHARS): builddir $(DO_CHARS) -$(STATUS): builddir +$(STATUS): builddir loader $(DO_STATUS) $(LOADER): builddir -- cgit v1.2.3 From e3d7d44a4eb599e7168158c66c6421e6e5f867a0 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 21 Jul 2015 07:52:58 +0200 Subject: [build] include merged fontloader in resources This ensures the file is included in the TDS repository. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f81f544..2613db4 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua CHARS = $(BUILDDIR)/$(NAME)-characters.lua STATUS = $(BUILDDIR)/$(NAME)-status.lua LOADER = $(BUILDDIR)/fontloader-$(shell date +%F).lua -RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) +RESOURCES = $(GLYPHS) $(CHARS) $(LOADER) $(STATUS) SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location -- cgit v1.2.3 From 6eff203e9bf3348d090b6b5046466415bcd6530a Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 21 Jul 2015 08:11:21 +0200 Subject: [mkstatus,build,conf] default to packaged fontloader via status file This adds an entry ``loader`` on the ``notes`` hash in the status table by means of which the fontloader can be specified. The status file is read when building the configuration table, and if it is present the entry in the ``loader`` table will be used as the default fontloader. Otherwise, Luaotfload falls back on the reference loader. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2613db4..bd0021b 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ LUA = texlua ## variables. DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null -DO_STATUS = $(LUA) $(STATUSSCRIPT) $(LOADER) >/dev/null +DO_STATUS = $(LUA) $(STATUSSCRIPT) --fontloader=$(LOADER) >/dev/null DO_IMPORT = $(LUA) $(IMPORTSCRIPT) import >/dev/null DO_PACKAGE = $(LUA) $(IMPORTSCRIPT) package \ $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) >/dev/null -- cgit v1.2.3