Browse Source

build the en manpages in subdirectory doc/en

Building manpages becames more consistent this way and
it is simpler to ignore build artefacts, too.
tags/devuan/2.0.1+devuan1
David Kalnischkies 7 years ago
parent
commit
ac62eb38b0
6 changed files with 74 additions and 60 deletions
  1. +1
    -0
      .gitignore
  2. +7
    -5
      buildlib/po4a_manpage.mak
  3. +7
    -0
      debian/changelog
  4. +2
    -2
      debian/rules
  5. +38
    -0
      doc/en/makefile
  6. +19
    -53
      doc/makefile

+ 1
- 0
.gitignore View File

@@ -14,6 +14,7 @@
/doc/*/
!/doc/examples/
!/doc/po/
!/doc/en/makefile

# package building artifacts
/debian/*.log


+ 7
- 5
buildlib/po4a_manpage.mak View File

@@ -25,6 +25,7 @@ $(LOCAL)-LIST := $(SOURCE)

# Install generation hooks
manpages: $($(LOCAL)-LIST)
clean: clean/$(LOCAL)
veryclean: veryclean/$(LOCAL)

apt-verbatim.ent: ../apt-verbatim.ent
@@ -37,15 +38,16 @@ manpage-style.xsl: ../manpage-style.xsl
$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
echo Creating man page $@
$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'
mv -f $(subst .$(LC),,$@) $@

# Clean rule
.PHONY: veryclean/$(LOCAL)
.PHONY: clean/$(LOCAL) veryclean/$(LOCAL)
clean/$(LOCAL):
rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent
veryclean/$(LOCAL):
-rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \
$(addsuffix .xml,$($(@F)-LIST)) \
offline.$(LC).sgml guide.$(LC).sgml
# we are nuking the directory we are working in as it is auto-generated
rm -rf $(shell readlink -f .)

HAVE_PO4A=yes
endif


+ 7
- 0
debian/changelog View File

@@ -1,3 +1,10 @@
apt (0.9.8.3) UNRELEASED; urgency=low

[ David Kalnischkies ]
* build the en manpages in subdirectory doc/en

-- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200

apt (0.9.8.2) unstable; urgency=low

[ Programs translations ]


+ 2
- 2
debian/rules View File

@@ -203,7 +203,7 @@ apt: build build-manpages
dh_bugfiles -p$@
dh_lintian -p$@
dh_installexamples -p$@ $(BLD)/docs/examples/*
dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
dh_installcron -p$@
dh_installdocs -p$@
dh_installchangelogs -p$@
@@ -253,7 +253,7 @@ apt-utils: build build-manpages
dh_installexamples -p$@

# Install the man pages..
dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))

dh_installchangelogs -p$@
dh_strip -p$@


+ 38
- 0
doc/en/makefile View File

@@ -0,0 +1,38 @@
# -*- make -*-
BASE=../..
SUBDIR=doc/en

# Bring in the default rules
include ../../buildlib/defaults.mak

# Do not use XMLTO, build the manpages directly with XSLTPROC
ifdef XSLTPROC
# generate a list of accepted man page translations
SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml))
INCLUDES = ../apt.ent ../apt-verbatim.ent
STYLESHEET=../manpage-style.xsl

LOCAL := manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)

# Install generation hooks
manpages: $($(LOCAL)-LIST) apt.8

$($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES)
echo Creating man page $@
$(XSLTPROC) -o $@ $(STYLESHEET) $<

apt.8: ../apt.8
cp -a ../apt.8 apt.8

# Clean rule
.PHONY: clean/$(LOCAL)
veryclean: clean/$(LOCAL)
clean: clean/$(LOCAL)
clean/$(LOCAL):
-rm -rf $($(@F)-LIST) apt.8
endif

# Chain to the manpage rule
SOURCE = apt.8
include $(MANPAGE_H)

+ 19
- 53
doc/makefile View File

@@ -1,7 +1,6 @@
# -*- make -*-
BASE=..
SUBDIR=doc
SUBDIRS= $(dir $(wildcard */makefile))

# Bring in the default rules
include ../buildlib/defaults.mak
@@ -13,34 +12,6 @@ include $(DEBIANDOC_H)

doc: manpages debiandoc

# Do not use XMLTO, build the manpages directly with XSLTPROC
ifdef XSLTPROC
# generate a list of accepted man page translations
SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
INCLUDES = apt.ent apt-verbatim.ent
STYLESHEET=manpage-style.xsl

LOCAL := manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)

# Install generation hooks
manpages: $($(LOCAL)-LIST)

$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
echo Creating man page $@
$(XSLTPROC) -o $@ $(STYLESHEET) $<

# Clean rule
.PHONY: veryclean/$(LOCAL)
veryclean: veryclean/$(LOCAL)
veryclean/$(LOCAL):
-rm -rf $($(@F)-LIST)
endif

# Chain to the manpage rule
SOURCE = apt.8
include $(MANPAGE_H)

examples/sources.list: examples/sources.list.in apt-verbatim.ent
sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list

@@ -50,42 +21,43 @@ TO = $(DOC)
TARGET = binary
include $(COPY_H)

.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats
.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats

clean: clean-subdirs
veryclean: veryclean-subdirs
clean: clean/subdirs
veryclean: veryclean/subdirs
manpages: manpages/subdirs
debiandoc: debiandoc/subdirs

clean-subdirs:
for dir in $(SUBDIRS); do\
$(MAKE) -C $$dir clean; \
done
DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))

veryclean-subdirs:
for dir in $(SUBDIRS); do\
rm -rf $$dir; \
dirs: $(DOCDIRLIST)
$(DOCDIRLIST) :: %/makefile : lang.makefile
test -d $(dir $@) || mkdir $(dir $@)
sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@

debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: dirs
for dir in en $(dir $(DOCDIRLIST)); do \
$(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
done

stats:
for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done

ifdef PO4A
DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO))
DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO))

MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO))
.PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST)

.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST)

manpages: $(MANPAGEPOLIST)
debiandoc: $(DEBIANDOCPOLIST)
po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST)
po4a: manpages/subdirs debiandoc/subdirs

update-po:
po4a --previous --no-backups --force --no-translations \
--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf

manpages/subdirs: $(MANPAGEPOLIST)
$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
# first line is for apt.8 (see Bug#696923)
po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
@@ -100,19 +72,13 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \
--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
$(MAKE) -C $(dir $<) manpages

debiandoc/subdirs: $(DEBIANDOCPOLIST)
$(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf
po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
$(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \
--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
$(MAKE) -C $(dir $<) debiandoc

dirs: $(MANPAGEDIRLIST)
$(MANPAGEDIRLIST) :: %/makefile : lang.makefile
test -d $(dir $@) || mkdir $(dir $@)
sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@
endif

ifdef DOXYGEN


Loading…
Cancel
Save