[Po4a-commits] "po4a/share ChangeLog, 1.4, 1.5 po4a-build, 1.3, 1.4 po4a-build.conf, 1.2, 1.3 po4a-build.conf.example, 1.1, 1.2"
Neil Williams
codehelp at alioth.debian.org
Wed Nov 11 00:47:27 UTC 2009
Update of /cvsroot/po4a/po4a/share
In directory alioth:/tmp/cvs-serv2498
Modified Files:
ChangeLog po4a-build po4a-build.conf po4a-build.conf.example
Log Message:
* po4a-build: Properly separate man (3) from man (1) XML
* po4a-build.conf: Update with modified variables.
* po4a-build.conf.example: Update the example too.
Index: po4a-build.conf.example
===================================================================
RCS file: /cvsroot/po4a/po4a/share/po4a-build.conf.example,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- po4a-build.conf.example 6 Nov 2009 22:37:39 -0000 1.1
+++ po4a-build.conf.example 11 Nov 2009 00:47:24 -0000 1.2
@@ -11,21 +11,27 @@
BASEDIR="doc"
# the binary packages that will contain generated manpages
BINARIES="package"
-# the binary packages with manpages in Section 3.
-HASMAN3=""
+# the Docbook XML manpages for Section 3.
+XMLMAN3="foo.3.xml"
# the binary packages using DocBook XML & xsltproc
XMLPACKAGES="package"
-# the DocBook XML files (TODO: let this take paths)
-XMLFILE="overview.xml HOWTO.xml"
+# the DocBook XML files for Section 1.
+XMLMAN1="bar.1.xml"
# the pattern to find the XML files
XMLDIR="doc"
# the pattern to find the .docbook files
DOCBOOKDIR=""
-# the POD files (TODO: let this take paths)
+# the POD files for man1
PODFILE=""
+# the POD files for man3/ - module names regenerated from the path.
+PODMODULES=""
+# POD files for section 7
+POD7FILES=""
# the binary packages using POD
PODPACKAGES=""
# html output (subdirectory of BASEDIR)
HTMLDIR="html"
# html DocBook file
HTMLFILE="HOWTO.xml"
+# Minimal threshold for translation percentage to keep
+KEEP=
Index: po4a-build.conf
===================================================================
RCS file: /cvsroot/po4a/po4a/share/po4a-build.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- po4a-build.conf 10 Nov 2009 23:40:30 -0000 1.2
+++ po4a-build.conf 11 Nov 2009 00:47:24 -0000 1.3
@@ -11,23 +11,29 @@
BASEDIR="doc"
# the binary packages that will contain generated manpages
BINARIES="po4a"
-# the binary packages with manpages in Section 3.
-HASMAN3=""
+# the Docbook XML manpages for Section 3.
+XMLMAN3=""
# the binary packages using DocBook XML & xsltproc
XMLPACKAGES="po4a"
-# the DocBook XML files (TODO: let this take paths)
-XMLFILE="po4a-build.xml po4aman-display-po.xml po4apod-display-po.xml"
+# the DocBook XML files for Section 1.
+XMLMAN1="po4a-build.xml po4aman-display-po.xml po4apod-display-po.xml"
# the pattern to find the XML files
XMLDIR="doc"
# the pattern to find the .docbook files
DOCBOOKDIR=""
-# the POD files (TODO: let this take paths)
+# the POD files for man1
PODFILE=""
+# the POD files for man3/ - module names regenerated from the path.
+PODMODULES=""
+# POD files for section 7
+POD7FILES=""
# the binary packages using POD
PODPACKAGES=""
# html output (subdirectory of BASEDIR)
HTMLDIR=""
# html DocBook file
HTMLFILE=""
+# Minimal threshold for translation percentage to keep
+KEEP=
# Reserved value only for internal builds
USE_INTERNAL_PO4A=yes
Index: ChangeLog
===================================================================
RCS file: /cvsroot/po4a/po4a/share/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog 10 Nov 2009 23:40:53 -0000 1.4
+++ ChangeLog 11 Nov 2009 00:47:24 -0000 1.5
@@ -1,3 +1,9 @@
+2009-11-11 Neil Williams <linux at codehelp.co.uk>
+
+ * po4a-build: Properly separate man (3) from man (1) XML
+ * po4a-build.conf: Update with modified variables.
+ * po4a-build.conf.example: Update the example too.
+
2009-11-10 Neil Williams <linux at codehelp.co.uk>
* po4a-build: Add support for man (7) and include
Index: po4a-build
===================================================================
RCS file: /cvsroot/po4a/po4a/share/po4a-build,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- po4a-build 10 Nov 2009 23:25:05 -0000 1.3
+++ po4a-build 11 Nov 2009 00:47:24 -0000 1.4
@@ -38,20 +38,24 @@
BASEDIR=""
# the binary packages that will contain generated manpages
BINARIES=""
-# the binary packages with manpages in Section 3.
-HASMAN3=""
+# the Docbook XML manpages for Section 3.
+XMLMAN3=""
# the binary packages using DocBook XML & xsltproc
XMLPACKAGES=""
-# the DocBook XML files (TODO: let this take paths)
-XMLFILE=""
+# the DocBook XML files for Section 1.
+XMLMAN1=""
# the pattern to find the XML files
XMLDIR=""
# the pattern to find the .docbook files
DOCBOOKDIR=""
# the XSL file to use for Docbook XSL
XSLFILE="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
-# the POD files (TODO: let this take paths)
+# the POD files for man1
PODFILE=""
+# the POD files for man3/ - module names regenerated from the path.
+PODMODULES=""
+# POD files for section 7
+POD7FILES=""
# the binary packages using POD
PODPACKAGES=""
# html output (subdirectory of BASEDIR)
@@ -60,6 +64,8 @@
HTMLFILE=""
# the XSL file to use for Docbook XSL
HTMLXSL="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
+# Minimal threshold for translation percentage to keep
+KEEP=
# remember to add something to the clean:: rule in debian/rules
# to remove each binary package sub-directory.
@@ -186,7 +192,7 @@
for d in $BINARIES; do
for l in $LANGS; do
mkdir -p $BASEDIR/$d/man/$l/man1/
- if [ "$d" = "$HASMAN3" ]; then
+ if [ "$d" = "$XMLsMAN3" ]; then
mkdir -p $BASEDIR/$d/man/$l/man3/
fi
if [ -n "$PODMODULES" ]; then
@@ -200,7 +206,7 @@
fi
done
mkdir -p $BASEDIR/$d/man/man1/
- if [ "$d" = "$HASMAN3" ]; then
+ if [ "$d" = "$XMLMAN3" ]; then
mkdir -p $BASEDIR/$d/man/man3/
fi
mkdir -p $BASEDIR/pod/$l/
@@ -228,16 +234,17 @@
for d in $BINARIES; do
for P in $XMLPACKAGES; do
if [ $d = $P ]; then
- for X in $XMLFILE; do
- eval_gettext "Processing untranslated files for $d . . ."; echo
+ for X in $XMLMAN1; do
+ eval_gettext "Processing untranslated files for $X (1). . ."; echo
+ MANDIR=$BASEDIR/$P/man/man1/
XML_CATALOG_FILES="/etc/xml/catalog" \
- xsltproc -o $BASEDIR/$P/man/ --nonet $XSLFILE $XMLDIR/$X
- if [ "$d" = "$HASMAN3" ]; then
- mv $BASEDIR/$P/man/*.3 $BASEDIR/$P/man/man3/
- else
- rm -f $BASEDIR/$P/man/*.3
- fi
- mv $BASEDIR/$P/man/*.1 $BASEDIR/$P/man/man1/
+ xsltproc -o $MANDIR --nonet $XSLFILE $XMLDIR/$X
+ done
+ for X3 in $XMLMAN3; do
+ eval_gettext "Processing untranslated files for $X3 (3). . ."; echo
+ MANDIR=$BASEDIR/$P/man/man3/
+ XML_CATALOG_FILES="/etc/xml/catalog" \
+ xsltproc -o $MANDIR --nonet $XSLFILE $XMLDIR/$X3
done
fi
done
@@ -277,19 +284,22 @@
for l in $LANGS; do
for P in $XMLPACKAGES; do
if [ $d = "$P" ]; then
- for X in $XMLFILE; do
+ for X in $XMLMAN1; do
if [ -f $XMLDIR/$l/$X ]; then
- eval_gettext "Processing $l translations for $d . . ."; echo
+ eval_gettext "Processing $l translations for $X (1). . ."; echo
+ MANDIR=$BASEDIR/$P/man/$l/man1/
XML_CATALOG_FILES="/etc/xml/catalog" \
- xsltproc -o $BASEDIR/$P/man/ --nonet $XSLFILE $XMLDIR/$l/$X
+ xsltproc -o $MANDIR --nonet $XSLFILE $XMLDIR/$X
+ fi
+ done
+ for X3 in $XMLMAN3; do
+ if [ -f $XMLDIR/$l/$X3 ]; then
+ eval_gettext "Processing $l translations for $X3 (3). . ."; echo
+ MANDIR=$BASEDIR/$P/man/$l/man3/
+ XML_CATALOG_FILES="/etc/xml/catalog" \
+ xsltproc -o $MANDIR --nonet $XSLFILE $XMLDIR/$X3
fi
done
- if [ "$d" = "$HASMAN3" ]; then
- mv $BASEDIR/$P/man/*.3 $BASEDIR/$P/man/$l/man3/
- else
- rm -f $BASEDIR/$P/man/*.3
- fi
- mv $BASEDIR/$P/man/*.1 $BASEDIR/$P/man/$l/man1/
fi
done
for POD in $PODPACKAGES; do
More information about the Po4a-commits
mailing list