From 6994cb2008263678c183228c97dea673babb6f1e Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Wed, 19 Aug 2026 23:52:05 +0200 Subject: fix(install): ship lang/ so installed colitur resolves names la.ini and en.ini (725 Latin/English liturgical names -- the entire point of the naming-and-config work just merged) had no dune install rule, so make install / dune install never copied them to /share/colitur/lang/. bin/main.ml's lang_dir() probes exactly that installed path first, falling back to a build-tree layout that also does not exist for an installed binary -- so every installed user silently got raw slugs (ef-circumcision) and untranslated terms (epistle/gospel) instead of resolved names, with no error at all. The defect existed because nobody had run the installed binary from a directory with no colitur source tree above it: dune exec and dune test always resolve lang/ via the build tree, materialized as a side effect of test/dune's cram deps, so every in-tree check stayed green while the installed artifact was broken. Add lang/dune, following schema/dune's exact pattern: an install stanza placing la.ini and en.ini at /share/colitur/lang/, matching where bin/main.ml's lang_dir() already looked. No code change was needed there -- only the missing install rule. Update Makefile's install target help text and summary echo to mention lang alongside ef/templates/schema. Verified end to end: uninstalled, removed lang/dune, rebuilt and reinstalled to reproduce the bug from an outside directory (~/tmp, colitur table showed ef-circumcision/epistle); restored lang/dune, reinstalled, and confirmed the same command now shows the resolved Latin name and rubric terms, that ~/.local/share/colitur/lang/ contains both files, and that colitur emit --format csv shows a real name in the name column. lang/la.ini and lang/en.ini are untouched. Full suite: dune test --force, 495 tests, 0 failures. --- Makefile | 4 ++-- lang/dune | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 lang/dune diff --git a/Makefile b/Makefile index 3f534c3..c96113f 100644 --- a/Makefile +++ b/Makefile @@ -113,14 +113,14 @@ check-citations: ## verify lang/la.ini's LT.txt: citations (needs docs/resear echo "SKIPPED: python3 not installed -- citations NOT verified this run"; \ fi -install: build ## install binary, calendar data, templates, schema and man pages into PREFIX (default ~/.local) +install: build ## install binary, calendar data, language tables, templates, schema and man pages into PREFIX (default ~/.local) $(DUNE) dune install --prefix $(PREFIX) @mkdir -p $(MANDIR) install -m 644 man/colitur.1 $(MANDIR)/colitur.1 @mkdir -p $(MAN5DIR) install -m 644 man/colitur-overlay.5 $(MAN5DIR)/colitur-overlay.5 install -m 644 man/colitur-templates.5 $(MAN5DIR)/colitur-templates.5 - @echo "installed $(BINDIR)/$(COLITUR), data in $(PREFIX)/share/colitur/{ef,templates,schema}, man pages in $(MANDIR) and $(MAN5DIR)" + @echo "installed $(BINDIR)/$(COLITUR), data in $(PREFIX)/share/colitur/{ef,lang,templates,schema}, man pages in $(MANDIR) and $(MAN5DIR)" @command -v $(COLITUR) >/dev/null 2>&1 || \ echo "note: $(BINDIR) is not on PATH -- add it, or run $(BINDIR)/$(COLITUR) directly" diff --git a/lang/dune b/lang/dune new file mode 100644 index 0000000..057e95a --- /dev/null +++ b/lang/dune @@ -0,0 +1,17 @@ +; The 725-name Latin/English liturgical vocabulary, installed into +; /share/colitur/lang/ so an installed `colitur` can find la.ini +; the same way it finds its calendar data -- bin/main.ml's own [lang_dir] +; probes exactly this location as its INSTALLED candidate, mirroring +; data/dune's own ef/ layout and schema/dune's own schema/ layout. +; +; Without this file, `make install`/`dune install` never copied lang/ at +; all: la.ini and en.ini are the entire point of the naming-and-config +; work, and an installed binary silently degraded to raw slugs +; (Lang.raw) with no error, because [lang_dir]'s installed candidate +; never existed. Task: naming-and-config hotfix. +(install + (section share) + (package colitur) + (files + (la.ini as lang/la.ini) + (en.ini as lang/en.ini))) -- cgit v1.3