From 2a52e8c56b71fa894c52ff93d6b98c39c00dc4e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 17:23:58 +0200 Subject: =?UTF-8?q?=20=20[=20Nicolas=20Fran=C3=A7ois=20]=20=20=20*=20Clean?= =?UTF-8?q?ed=20up=20the=20first=20patch=20draft=20from=20KURASAWA=20Nozom?= =?UTF-8?q?u=20to=20finally=20=20=20=20=20get=20po4a=20support=20for=20tra?= =?UTF-8?q?nslating=20the=20man=20pages.=20=20=20=20=20Many=20thanks=20to?= =?UTF-8?q?=20both=20for=20this=20excellent=20work!=20(Closes:=20#441608)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/makefile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index 6ea1c1343..e12de7228 100644 --- a/doc/makefile +++ b/doc/makefile @@ -26,22 +26,27 @@ TARGET = binary include $(COPY_H) #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr -doc: doc.fr doc.ja doc.pl doc.pt_BR doc.es +doc: po4a + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir $@; \ + done -doc.fr: %.fr: - $(MAKE) -C fr $* +.PHONY: update-po po4a +update-po: + po4a --previous --no-backups --force --no-translations po4a.conf -doc.pt_BR: %.pt_BR: - $(MAKE) -C pt_BR $* +clean: po4a-clean clean-subdirs -doc.es: %.es: - $(MAKE) -C es $* +clean-subdirs: + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir $@; \ + done -doc.ja: %.ja: - $(MAKE) -C ja $* +po4a-clean: + po4a --previous --rm-backups --rm-translations po4a.conf -doc.pl: %.pl: - $(MAKE) -C pl $* +po4a: + po4a --previous --no-backups po4a.conf ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) -- cgit v1.2.3 From b01390eaa5750f28f258308b546f398ea5d89e3c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 27 Aug 2009 15:28:28 +0200 Subject: * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages Add a bit more autodetection to the buildsystem to be able to add only half translated languages (only a few man pages, not all) and try to reduce the overhead needed to add new languages. --- doc/makefile | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index e12de7228..2a2663fb3 100644 --- a/doc/makefile +++ b/doc/makefile @@ -1,7 +1,7 @@ # -*- make -*- BASE=.. SUBDIR=doc -SUBDIRS= fr ja pl pt_BR es +SUBDIRS= $(dir $(wildcard */makefile)) # Bring in the default rules include ../buildlib/defaults.mak @@ -26,27 +26,39 @@ TARGET = binary include $(COPY_H) #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr -doc: po4a +doc: for dir in $(SUBDIRS); do\ $(MAKE) -C $$dir $@; \ done -.PHONY: update-po po4a -update-po: - po4a --previous --no-backups --force --no-translations po4a.conf - -clean: po4a-clean clean-subdirs +clean: clean-subdirs +veryclean: veryclean-subdirs clean-subdirs: for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir $@; \ + $(MAKE) -C $$dir clean; \ + done + +veryclean-subdirs: + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir veryclean; \ done +ifdef PO4A +doc: po4a + +clean: po4a-clean + +.PHONY: update-po po4a +update-po: + po4a --previous --no-backups --force --no-translations po4a.conf + po4a-clean: po4a --previous --rm-backups --rm-translations po4a.conf po4a: po4a --previous --no-backups po4a.conf +endif ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) -- cgit v1.2.3 From 0e65be59ac218d9479d429ab6cf24e072fdb819b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 30 Sep 2009 19:15:38 +0200 Subject: move the it translation of the guide to its own subdirectory for consitents and sake of the universe reasons --- doc/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index 2a2663fb3..0f6d5afa3 100644 --- a/doc/makefile +++ b/doc/makefile @@ -7,7 +7,7 @@ SUBDIRS= $(dir $(wildcard */makefile)) include ../buildlib/defaults.mak # Debian Doc SGML Documents -SOURCE = dpkg-tech.sgml design.sgml files.sgml guide.sgml guide.it.sgml \ +SOURCE = dpkg-tech.sgml design.sgml files.sgml guide.sgml \ cache.sgml method.sgml offline.sgml include $(DEBIANDOC_H) -- cgit v1.2.3 From 7652e03e9909ac65dab11a8cabb9ea5b77ef95ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Oct 2009 18:33:22 +0200 Subject: add guide.sgml and offline.sgml to the "translatable with po4a"-group Fix also the buildsystem for building the coresponding docs from these two files if they are exist for this language so we don't need to change the makefiles for ja and fr - and can also use the same simple makefiles for it and pl which ship these files as not-yet-with-po4a-translated (and currently no man page translation.) --- doc/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index 0f6d5afa3..fe53aba48 100644 --- a/doc/makefile +++ b/doc/makefile @@ -7,8 +7,8 @@ SUBDIRS= $(dir $(wildcard */makefile)) include ../buildlib/defaults.mak # Debian Doc SGML Documents -SOURCE = dpkg-tech.sgml design.sgml files.sgml guide.sgml \ - cache.sgml method.sgml offline.sgml +SOURCE = $(wildcard *.sgml) +DEBIANDOC_HTML_OPTIONS=-l en include $(DEBIANDOC_H) # XML man pages -- cgit v1.2.3 From 944b2fffc4a54fbf9329faa579592cc758915a99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Oct 2009 21:34:31 +0100 Subject: remove generated sgml files (if we really had build them) --- doc/makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index fe53aba48..26ca52a9e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -43,6 +43,14 @@ veryclean-subdirs: for dir in $(SUBDIRS); do\ $(MAKE) -C $$dir veryclean; \ done + # FIXME remove created sgml files, but preserve all + # which are "left over" from older systems. + # After completing the transition this should be handled + # in the po4a-manpage makefile for all translations + for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/debiandoc*))); do\ + rm -f $$dir/offline.$$dir.sgml; \ + rm -f $$dir/guide.$$dir.sgml; \ + done ifdef PO4A doc: po4a -- cgit v1.2.3 From 41f28cb341b1757162826ba2f8fc1ce75ecb25b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 1 Nov 2009 23:36:09 +0100 Subject: disable addendum for sgml-files as we have no valid file until now Will be reenabled after Translators provide such a file. --- doc/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index 26ca52a9e..0cb135c7b 100644 --- a/doc/makefile +++ b/doc/makefile @@ -47,7 +47,7 @@ veryclean-subdirs: # which are "left over" from older systems. # After completing the transition this should be handled # in the po4a-manpage makefile for all translations - for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/debiandoc*))); do\ + for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/*))); do\ rm -f $$dir/offline.$$dir.sgml; \ rm -f $$dir/guide.$$dir.sgml; \ done -- cgit v1.2.3 From 93517da394859666e4af08f518dfb95c4ac271dd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 2 Nov 2009 10:26:52 +0100 Subject: fix/simplify buildsystem for the (now) po4a-only manpages --- doc/makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index 0cb135c7b..fe53aba48 100644 --- a/doc/makefile +++ b/doc/makefile @@ -43,14 +43,6 @@ veryclean-subdirs: for dir in $(SUBDIRS); do\ $(MAKE) -C $$dir veryclean; \ done - # FIXME remove created sgml files, but preserve all - # which are "left over" from older systems. - # After completing the transition this should be handled - # in the po4a-manpage makefile for all translations - for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/*))); do\ - rm -f $$dir/offline.$$dir.sgml; \ - rm -f $$dir/guide.$$dir.sgml; \ - done ifdef PO4A doc: po4a -- cgit v1.2.3 From e46a23a59689c917ad3e589a84add9fdfa498159 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 2 Nov 2009 17:54:22 +0100 Subject: remove traces of old manpage-buildsystems --- doc/makefile | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'doc/makefile') diff --git a/doc/makefile b/doc/makefile index fe53aba48..6fb604e4e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,13 +11,34 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en include $(DEBIANDOC_H) -# XML man pages -SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ - apt-config.8 apt_preferences.5 \ - apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \ - apt-key.8 apt-secure.8 apt-mark.8 -INCLUDES = apt.ent -include $(XML_MANPAGE_H) +# 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 +STYLESHEET=manpage-style.xsl + +LOCAL := manpage-$(firstword $(SOURCE)) +$(LOCAL)-LIST := $(SOURCE) + +# Install generation hooks +doc: $($(LOCAL)-LIST) +veryclean: veryclean/$(LOCAL) + +$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XSLTPROC) -o $@ $(STYLESHEET) $< + +# Clean rule +.PHONY: veryclean/$(LOCAL) +veryclean/$(LOCAL): + -rm -rf $($(@F)-LIST) + +endif + +# Chain to the manpage rule +SOURCE = apt.8 +include $(MANPAGE_H) # Examples SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf @@ -78,5 +99,4 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile touch $(BUILD)/doc/doxygen-stamp doc: $(BUILD)/doc/doxygen-stamp - endif -- cgit v1.2.3