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-70-g09d2 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 --- .bzrignore | 14 +++----------- buildlib/po4a_manpage.mak | 3 ++- buildlib/sgml_manpage.mak | 45 --------------------------------------------- doc/es/makefile | 9 ++++----- doc/makefile | 8 -------- doc/pt_BR/makefile | 7 ++++--- 6 files changed, 13 insertions(+), 73 deletions(-) delete mode 100644 buildlib/sgml_manpage.mak (limited to 'doc/makefile') diff --git a/.bzrignore b/.bzrignore index 660c3e027..45db3c607 100644 --- a/.bzrignore +++ b/.bzrignore @@ -9,7 +9,8 @@ autom4te.cache/ build/ configure -# generated apt man pages +# generated files in the progress to build all +# apt man pages and other documentation doc/*.1 doc/*.5 doc/*.8 @@ -17,14 +18,5 @@ doc/*/*.1 doc/*/*.5 doc/*/*.8 doc/*/apt.ent - -# ignore xml man page files generated by po4a -# older translation methods translate in this files -# so we can not ignore it for all translations now doc/*/*.xml - -# FIXME: files generated by deprecated sgml man pages -doc/es/manpage.links -doc/es/manpage.refs -doc/pt_BR/manpage.links -doc/pt_BR/manpage.refs +doc/*/*.sgml diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 3d90c6ba4..dfa215d29 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -35,7 +35,8 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) .PHONY: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \ - $(addsuffix .xml,$($(@F)-LIST)) + $(addsuffix .xml,$($(@F)-LIST)) \ + offline.$(LC).sgml guide.$(LC).sgml HAVE_PO4A=yes endif diff --git a/buildlib/sgml_manpage.mak b/buildlib/sgml_manpage.mak deleted file mode 100644 index 5fcb75c46..000000000 --- a/buildlib/sgml_manpage.mak +++ /dev/null @@ -1,45 +0,0 @@ -# -*- make -*- - -# This handles man pages in DocBook SGMLL format. We convert to the respective -# output in the source directory then copy over to the final dest. This -# means yodl is only needed if compiling from CVS - -# Input -# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 -# the sgml files are called apt-cache.8.sgml - -# See defaults.mak for information about LOCAL - -# Some local definitions -ifdef DOCBOOK2MAN - -LOCAL := sgml-manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) - -$($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES) - echo Creating man page $@ - $(DOCBOOK2MAN) $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - -HAVE_SGML=yes -endif - -INCLUDES := - -ifndef HAVE_SGML -# Strip from the source list any man pages we dont have compiled already -SOURCE := $(wildcard $(SOURCE)) -endif - -# Chain to the manpage rule -ifneq ($(words $(SOURCE)),0) -include $(MANPAGE_H) -endif diff --git a/doc/es/makefile b/doc/es/makefile index 81a410c5c..0b5b52222 100644 --- a/doc/es/makefile +++ b/doc/es/makefile @@ -5,8 +5,7 @@ SUBDIR=doc/es # Bring in the default rules include ../../buildlib/defaults.mak -# Man pages -SOURCE = apt-cache.es.8 apt-get.es.8 apt-cdrom.es.8 apt.conf.es.5 \ - sources.list.es.5 apt-config.es.8 apt_preferences.es.5 -INCLUDES = apt.ent.es -include $(SGML_MANPAGE_H) +# Language Code of this translation +LC=es + +include $(PO4A_MANPAGE_H) 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 diff --git a/doc/pt_BR/makefile b/doc/pt_BR/makefile index 4c9ea6293..6e485bbf6 100644 --- a/doc/pt_BR/makefile +++ b/doc/pt_BR/makefile @@ -5,6 +5,7 @@ SUBDIR=doc/pt_BR # Bring in the default rules include ../../buildlib/defaults.mak -SOURCE = apt_preferences.pt_BR.5 -INCLUDES = apt.ent.pt_BR -include $(SGML_MANPAGE_H) +# Language Code of this translation +LC=pt_BR + +include $(PO4A_MANPAGE_H) -- cgit v1.2.3-70-g09d2 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 --- buildlib/defaults.mak | 3 --- buildlib/environment.mak.in | 8 +------- buildlib/xml_manpage.mak | 45 --------------------------------------------- buildlib/yodl_manpage.mak | 42 ------------------------------------------ configure.in | 9 --------- debian/changelog | 7 +++++++ debian/control | 2 +- doc/makefile | 36 ++++++++++++++++++++++++++++-------- 8 files changed, 37 insertions(+), 115 deletions(-) delete mode 100644 buildlib/xml_manpage.mak delete mode 100644 buildlib/yodl_manpage.mak (limited to 'doc/makefile') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 5373ee5cf..bf93bd2ee 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -81,10 +81,7 @@ MANPAGE_H = $(BASE)/buildlib/manpage.mak PROGRAM_H = $(BASE)/buildlib/program.mak PYTHON_H = $(BASE)/buildlib/python.mak COPY_H = $(BASE)/buildlib/copy.mak -YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak -SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak -XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak FAIL_H = $(BASE)/buildlib/fail.mak PODOMAIN_H = $(BASE)/buildlib/podomain.mak diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index b3afca0ad..5fca48d5a 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -30,13 +30,7 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ DOXYGEN = @DOXYGEN@ -# SGML for the man pages -DOCBOOK2MAN := @DOCBOOK2MAN@ - -# XML for the man pages -XMLTO := @XMLTO@ - -# po4a for the man pages +# xsltproc for the man pages XSLTPROC := @XSLTPROC@ # po4a for the man pages diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak deleted file mode 100644 index c8b155d09..000000000 --- a/buildlib/xml_manpage.mak +++ /dev/null @@ -1,45 +0,0 @@ -# -*- make -*- - -# This handles man pages in DocBook XML format. We convert to the respective -# output in the source directory then copy over to the final dest. This -# means xmlto is only needed if compiling from Arch - -# Input -# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 -# the XML files are called apt-cache.8.xml - -# See defaults.mak for information about LOCAL - -# Some local definitions -ifdef XMLTO - -LOCAL := xml-manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) - -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) - echo Creating man page $@ - $(XMLTO) man $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - -HAVE_XMLTO=yes -endif - -INCLUDES := - -ifndef HAVE_XMLTO -# Strip from the source list any man pages we dont have compiled already -SOURCE := $(wildcard $(SOURCE)) -endif - -# Chain to the manpage rule -ifneq ($(words $(SOURCE)),0) -include $(MANPAGE_H) -endif diff --git a/buildlib/yodl_manpage.mak b/buildlib/yodl_manpage.mak deleted file mode 100644 index a5f436f60..000000000 --- a/buildlib/yodl_manpage.mak +++ /dev/null @@ -1,42 +0,0 @@ -# -*- make -*- - -# This handles man pages in YODL format. We convert to the respective -# output in the source directory then copy over to the final dest. This -# means yodl is only needed if compiling from CVS - -# Input -# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 -# the yodl files are called apt-cache.8.yo - -# See defaults.mak for information about LOCAL - -# Some local definitions -ifdef YODL_MAN - -LOCAL := yodl-manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) - -$($(LOCAL)-LIST) :: % : %.yo - echo Creating man page $@ - yodl2man -o $@ $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - -else - -# Strip from the source list any man pages we dont have compiled already -SOURCE := $(wildcard $(SOURCE)) - -endif - -# Chain to the manpage rule -ifneq ($(words $(SOURCE)),0) -include $(MANPAGE_H) -endif diff --git a/configure.in b/configure.in index 9d6589e55..9bcb94068 100644 --- a/configure.in +++ b/configure.in @@ -184,12 +184,6 @@ AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) dnl Check for doxygen AC_PATH_PROG(DOXYGEN, doxygen) -dnl Check for the SGML tools needed to build man pages -AC_PATH_PROG(DOCBOOK2MAN,docbook2man) - -dnl Check for the XML tools needed to build man pages -AC_PATH_PROG(XMLTO,xmlto) - dnl Check for the XSLTProc tool needed to build man pages together with po4a AC_PATH_PROG(XSLTPROC,xsltproc) @@ -202,9 +196,6 @@ AC_PATH_PROG([DOT], [dot], []) DOTDIR=$(dirname $DOT) AC_SUBST(DOTDIR) -dnl Check for YODL -dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") - ah_NUM_PROCS rc_GLIBC_VER rc_LIBSTDCPP_VER diff --git a/debian/changelog b/debian/changelog index 9c4d46e09..8db5fa3d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,13 @@ apt (0.7.25) UNRELEASED; urgency=low * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead + * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak: + - remove the now obsolete manpage buildsystems + * doc/{pl,pt_BR,es,it}/*.{sgml,xml}: + - convert all remaining translation to the po4a system + * debian/control: + - drop build-dependency on docbook-utils and xmlto + - add build-dependency on autotools-dev [ Chris Leick ] * doc/ various manpages: diff --git a/debian/control b/debian/control index 5db294f2e..18bcff3d4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), autotools-dev +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt 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-70-g09d2