From 9d9a700f1de6352b4f51a00ab80f2fcd70da050d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 13 Mar 2014 00:21:14 -0300 Subject: [PATCH] doc: build man pages at build time; introduce HAVE_SPHINX, HAVE_RST2MAN This helps avoid build artifacts (namely, nroff and gzipped-nroff man pages) owned by root. The variables allow choosing which generator to use for the man page. These will be hooked to configure in a following commit. --- Makefile.local | 2 +- doc/Makefile.local | 31 ++++++++++++++++++------------- doc/mkdocdeps.py | 3 +++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Makefile.local b/Makefile.local index 5f797ad0..cb7b1061 100644 --- a/Makefile.local +++ b/Makefile.local @@ -53,7 +53,7 @@ endif FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS) .PHONY: all -all: notmuch notmuch-shared +all: notmuch notmuch-shared build-man ifeq ($(MAKECMDGOALS),) ifeq ($(shell cat .first-build-message 2>/dev/null),) @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all diff --git a/doc/Makefile.local b/doc/Makefile.local index fd64f708..23f40952 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -13,10 +13,9 @@ mkdocdeps := python $(dir)/mkdocdeps.py # Internal variables. ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(dir) -.PHONY: sphinx-html sphinx-man sphinx-texinfo sphinx-info -.PHONY: rst2man +.PHONY: sphinx-html sphinx-texinfo sphinx-info -.PHONY: install-man +.PHONY: install-man build-man %.gz: % rm -f $@ && gzip --stdout $^ > $@ @@ -24,24 +23,30 @@ ALLSPHINXOPTS := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(dir) sphinx-html: $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCBUILDDIR)/html -sphinx-man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man - sphinx-texinfo: $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo sphinx-info: sphinx-texinfo make -C $(DOCBUILDDIR)/texinfo info -# fallback target in case sphinx not installed -rst2man: - $(prerst2man) $(DOCBUILDDIR)/.. $(DOCBUILDDIR)/man - -include $(dir)/docdeps.mk MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) -${MAN_ROFF_FILES} : sphinx-man +build-man: ${MAN_GZIP_FILES} + +${MAN_ROFF_FILES}: ${dir}/man.stamp + +$(dir)/man.stamp: ${MAN_RST_FILES} +ifeq ($(HAVE_SPHINX),1) + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man + touch $@ +else ifeq ($(HAVE_RST2MAN),1) + $(prerst2man) $(DOCBUILDDIR)/.. $(DOCBUILDDIR)/man + touch $@ +else + @echo "No sphinx or rst2man, will not install man pages." +endif install-man: ${MAN_GZIP_FILES} mkdir -p "$(DESTDIR)$(mandir)/man1" @@ -52,8 +57,8 @@ install-man: ${MAN_GZIP_FILES} install -m0644 $(DOCBUILDDIR)/man/*.7.gz $(DESTDIR)/$(mandir)/man7 cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz - $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py $(mkdocdeps) $< $(DOCBUILDDIR) $@ -CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk +CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(dir)/man.stamp +CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) diff --git a/doc/mkdocdeps.py b/doc/mkdocdeps.py index 2f4a9596..e61bea60 100644 --- a/doc/mkdocdeps.py +++ b/doc/mkdocdeps.py @@ -6,8 +6,11 @@ outfile = argv[3] execfile(conffile) roff_files = [] +rst_files = [] out=open(outfile,'w') for page in man_pages: + rst_files = rst_files + ["doc/{0:s}.rst".format(page[0])] roff_files = roff_files + ["{0:s}/man/{1:s}.{2:d}".format(builddir,page[1],page[4])] out.write ('MAN_ROFF_FILES := ' + ' \\\n\t'.join(roff_files)+'\n') +out.write ('MAN_RST_FILES := ' + ' \\\n\t'.join(rst_files)+'\n')