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 --- buildlib/po4a_manpage.mak | 3 ++- buildlib/sgml_manpage.mak | 45 --------------------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 buildlib/sgml_manpage.mak (limited to 'buildlib') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 3d90c6ba..dfa215d2 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 5fcb75c4..00000000 --- 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 -- 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 --- 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 'buildlib') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 5373ee5c..bf93bd2e 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 b3afca0a..5fca48d5 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 c8b155d0..00000000 --- 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 a5f436f6..00000000 --- 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 9d6589e5..9bcb9406 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 9c4d46e0..8db5fa3d 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 5db294f2..18bcff3d 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 fe53aba4..6fb604e4 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 From 7dc1a9352e12ee5fc4b92c0cf8012f2b49836be3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 2 Nov 2009 17:58:57 +0100 Subject: don't try to detect glibc and libstdc++ version as we don't need this information any longer --- buildlib/environment.mak.in | 2 -- buildlib/tools.m4 | 50 --------------------------------------------- configure.in | 2 -- 3 files changed, 54 deletions(-) (limited to 'buildlib') diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 5fca48d5..fdac3e6c 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -9,8 +9,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall CXX = @CXX@ CXXFLAGS+= @CXXFLAGS@ NUM_PROCS = @NUM_PROCS@ -GLIBC_VER = @GLIBC_VER@ -LIBSTDCPP_VER = @LIBSTDCPP_VER@ # Linker stuff PICFLAGS+= -fPIC -DPIC diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index 9a8d744f..d1d69233 100644 --- a/buildlib/tools.m4 +++ b/buildlib/tools.m4 @@ -89,56 +89,6 @@ AC_DEFUN(ah_NUM_PROCS, AC_SUBST(NUM_PROCS) ]) -AC_DEFUN(rc_GLIBC_VER, - [AC_MSG_CHECKING([glibc version]) - AC_CACHE_VAL(ac_cv_glibc_ver, - dummy=if$$ - cat <<_GLIBC_>$dummy.c -#include -#include -#include -int main(int argc, char **argv) { printf("libc6.%d",__GLIBC_MINOR__); exit(0); } -_GLIBC_ - ${CC-cc} $dummy.c -o $dummy > /dev/null 2>&1 - if test "$?" = 0; then - GLIBC_VER=`./$dummy` - AC_MSG_RESULT([$GLIBC_VER]) - ac_cv_glibc_ver=$GLIBC_VER - else - AC_MSG_WARN([cannot determine GNU C library minor version number]) - fi - rm -f $dummy $dummy.c - ) - GLIBC_VER="-$ac_cv_glibc_ver" - AC_SUBST(GLIBC_VER) -]) - -AC_DEFUN(rc_LIBSTDCPP_VER, - [AC_MSG_CHECKING([libstdc++ version]) - dummy=if$$ - cat <<_LIBSTDCPP_>$dummy.cc -#include -#include -#include -int main(int argc, char **argv) { exit(0); } -_LIBSTDCPP_ - ${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1 - - if test "$?" = 0; then - soname=`objdump -p ./$dummy |grep NEEDED|grep libstd` - LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'` - fi - rm -f $dummy $dummy.cc - - if test -z "$LIBSTDCPP_VER"; then - AC_MSG_WARN([cannot determine standard C++ library version number]) - else - AC_MSG_RESULT([$LIBSTDCPP_VER]) - LIBSTDCPP_VER="-$LIBSTDCPP_VER" - fi - AC_SUBST(LIBSTDCPP_VER) -]) - AC_DEFUN(ah_GCC3DEP,[ AC_MSG_CHECKING(if $CXX -MD works) touch gcc3dep.cc diff --git a/configure.in b/configure.in index 9bcb9406..fe30d4ca 100644 --- a/configure.in +++ b/configure.in @@ -197,8 +197,6 @@ DOTDIR=$(dirname $DOT) AC_SUBST(DOTDIR) ah_NUM_PROCS -rc_GLIBC_VER -rc_LIBSTDCPP_VER ah_GCC3DEP dnl It used to be that the user could select translations and that could get -- cgit v1.2.3