Skip to content

Commit 3c49c6f

Browse files
peterepetere
committed
Convert documentation to DocBook XML
Since some preparation work had already been done, the only source changes left were changing empty-element tags like <xref linkend="foo"> to <xref linkend="foo"/>, and changing the DOCTYPE. The source files are still named *.sgml, but they are actually XML files now. Renaming could be considered later. In the build system, the intermediate step to convert from SGML to XML is removed. Everything is build straight from the source files again. The OpenSP (or the old SP) package is no longer needed. The documentation toolchain instructions are updated and are much simpler now. Peter Eisentraut, Alexander Lakhin, Jürgen Purtz
1 parent 2f8d636 commit 3c49c6f

File tree

346 files changed

+4257
-4585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+4257
-4585
lines changed

‎config/docbook.m4

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# config/docbook.m4
22

3-
# PGAC_PROG_NSGMLS
4-
# ----------------
5-
AC_DEFUN([PGAC_PROG_NSGMLS],
6-
[PGAC_PATH_PROGS(NSGMLS, [onsgmls nsgmls])])
3+
# PGAC_PATH_XMLLINT
4+
# -----------------
5+
AC_DEFUN([PGAC_PATH_XMLLINT],
6+
[PGAC_PATH_PROGS(XMLLINT, xmllint)])
77

88

99
# PGAC_CHECK_DOCBOOK(VERSION)
1010
# ---------------------------
1111
AC_DEFUN([PGAC_CHECK_DOCBOOK],
12-
[AC_REQUIRE([PGAC_PROG_NSGMLS])
13-
AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook],
14-
[cat >conftest.sgml <<EOF
15-
<!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN">
12+
[AC_REQUIRE([PGAC_PATH_XMLLINT])
13+
AC_CACHE_CHECK([for DocBook XML V$1], [pgac_cv_check_docbook],
14+
[cat >conftest.xml <<EOF
15+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V$1//EN" "http://www.oasis-open.org/docbook/xml/$1/docbookx.dtd">
1616
<book>
1717
<title>test</title>
1818
<chapter>
@@ -27,13 +27,13 @@ EOF
2727
2828
pgac_cv_check_docbook=no
2929
30-
if test -n "$NSGMLS"; then
31-
$NSGMLS -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
30+
if test -n "$XMLLINT"; then
31+
$XMLLINT --noout --valid conftest.xml 1>&AS_MESSAGE_LOG_FD 2>&1
3232
if test $? -eq 0; then
3333
pgac_cv_check_docbook=yes
3434
fi
3535
fi
36-
rm -f conftest.sgml])
36+
rm -f conftest.xml])
3737
3838
have_docbook=$pgac_cv_check_docbook
3939
AC_SUBST([have_docbook])

‎configure

Lines changed: 24 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,10 @@ vpath_build
630630
PG_VERSION_NUM
631631
PROVE
632632
FOP
633-
OSX
634633
XSLTPROC
635-
XMLLINT
636634
DBTOEPUB
637635
have_docbook
638-
NSGMLS
636+
XMLLINT
639637
TCL_SHLIB_LD_LIBS
640638
TCL_SHARED_BUILD
641639
TCL_LIB_SPEC
@@ -16132,19 +16130,19 @@ fi
1613216130
#
1613316131
# Check for DocBook and tools
1613416132
#
16135-
if test -z "$NSGMLS"; then
16136-
for ac_prog in onsgmls nsgmls
16133+
if test -z "$XMLLINT"; then
16134+
for ac_prog in xmllint
1613716135
do
1613816136
# Extract the first word of "$ac_prog", so it can be a program name with args.
1613916137
set dummy $ac_prog; ac_word=$2
1614016138
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1614116139
$as_echo_n "checking for $ac_word... " >&6; }
16142-
if ${ac_cv_path_NSGMLS+:} false; then :
16140+
if ${ac_cv_path_XMLLINT+:} false; then :
1614316141
$as_echo_n "(cached) " >&6
1614416142
else
16145-
case $NSGMLS in
16143+
case $XMLLINT in
1614616144
[\\/]* | ?:[\\/]*)
16147-
ac_cv_path_NSGMLS="$NSGMLS" # Let the user override the test with a path.
16145+
ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
1614816146
;;
1614916147
*)
1615016148
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -16154,7 +16152,7 @@ do
1615416152
test -z "$as_dir" && as_dir=.
1615516153
for ac_exec_ext in '' $ac_executable_extensions; do
1615616154
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16157-
ac_cv_path_NSGMLS="$as_dir/$ac_word$ac_exec_ext"
16155+
ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
1615816156
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1615916157
break 2
1616016158
fi
@@ -16165,35 +16163,35 @@ IFS=$as_save_IFS
1616516163
;;
1616616164
esac
1616716165
fi
16168-
NSGMLS=$ac_cv_path_NSGMLS
16169-
if test -n "$NSGMLS"; then
16170-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSGMLS" >&5
16171-
$as_echo "$NSGMLS" >&6; }
16166+
XMLLINT=$ac_cv_path_XMLLINT
16167+
if test -n "$XMLLINT"; then
16168+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
16169+
$as_echo "$XMLLINT" >&6; }
1617216170
else
1617316171
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1617416172
$as_echo "no" >&6; }
1617516173
fi
1617616174

1617716175

16178-
test -n "$NSGMLS" && break
16176+
test -n "$XMLLINT" && break
1617916177
done
1618016178

1618116179
else
16182-
# Report the value of NSGMLS in configure's output in all cases.
16183-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSGMLS" >&5
16184-
$as_echo_n "checking for NSGMLS... " >&6; }
16185-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSGMLS" >&5
16186-
$as_echo "$NSGMLS" >&6; }
16180+
# Report the value of XMLLINT in configure's output in all cases.
16181+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
16182+
$as_echo_n "checking for XMLLINT... " >&6; }
16183+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
16184+
$as_echo "$XMLLINT" >&6; }
1618716185
fi
1618816186

1618916187

16190-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook V4.2" >&5
16191-
$as_echo_n "checking for DocBook V4.2... " >&6; }
16188+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.2" >&5
16189+
$as_echo_n "checking for DocBook XML V4.2... " >&6; }
1619216190
if ${pgac_cv_check_docbook+:} false; then :
1619316191
$as_echo_n "(cached) " >&6
1619416192
else
16195-
cat >conftest.sgml <<EOF
16196-
<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
16193+
cat >conftest.xml <<EOF
16194+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
1619716195
<book>
1619816196
<title>test</title>
1619916197
<chapter>
@@ -16208,13 +16206,13 @@ EOF
1620816206

1620916207
pgac_cv_check_docbook=no
1621016208

16211-
if test -n "$NSGMLS"; then
16212-
$NSGMLS -s conftest.sgml 1>&5 2>&1
16209+
if test -n "$XMLLINT"; then
16210+
$XMLLINT --noout --valid conftest.xml 1>&5 2>&1
1621316211
if test $? -eq 0; then
1621416212
pgac_cv_check_docbook=yes
1621516213
fi
1621616214
fi
16217-
rm -f conftest.sgml
16215+
rm -f conftest.xml
1621816216
fi
1621916217
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_check_docbook" >&5
1622016218
$as_echo "$pgac_cv_check_docbook" >&6; }
@@ -16276,60 +16274,6 @@ $as_echo_n "checking for DBTOEPUB... " >&6; }
1627616274
$as_echo "$DBTOEPUB" >&6; }
1627716275
fi
1627816276

16279-
if test -z "$XMLLINT"; then
16280-
for ac_prog in xmllint
16281-
do
16282-
# Extract the first word of "$ac_prog", so it can be a program name with args.
16283-
set dummy $ac_prog; ac_word=$2
16284-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16285-
$as_echo_n "checking for $ac_word... " >&6; }
16286-
if ${ac_cv_path_XMLLINT+:} false; then :
16287-
$as_echo_n "(cached) " >&6
16288-
else
16289-
case $XMLLINT in
16290-
[\\/]* | ?:[\\/]*)
16291-
ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
16292-
;;
16293-
*)
16294-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16295-
for as_dir in $PATH
16296-
do
16297-
IFS=$as_save_IFS
16298-
test -z "$as_dir" && as_dir=.
16299-
for ac_exec_ext in '' $ac_executable_extensions; do
16300-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16301-
ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
16302-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16303-
break 2
16304-
fi
16305-
done
16306-
done
16307-
IFS=$as_save_IFS
16308-
16309-
;;
16310-
esac
16311-
fi
16312-
XMLLINT=$ac_cv_path_XMLLINT
16313-
if test -n "$XMLLINT"; then
16314-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
16315-
$as_echo "$XMLLINT" >&6; }
16316-
else
16317-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16318-
$as_echo "no" >&6; }
16319-
fi
16320-
16321-
16322-
test -n "$XMLLINT" && break
16323-
done
16324-
16325-
else
16326-
# Report the value of XMLLINT in configure's output in all cases.
16327-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
16328-
$as_echo_n "checking for XMLLINT... " >&6; }
16329-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
16330-
$as_echo "$XMLLINT" >&6; }
16331-
fi
16332-
1633316277
if test -z "$XSLTPROC"; then
1633416278
for ac_prog in xsltproc
1633516279
do
@@ -16384,60 +16328,6 @@ $as_echo_n "checking for XSLTPROC... " >&6; }
1638416328
$as_echo "$XSLTPROC" >&6; }
1638516329
fi
1638616330

16387-
if test -z "$OSX"; then
16388-
for ac_prog in osx sgml2xml sx
16389-
do
16390-
# Extract the first word of "$ac_prog", so it can be a program name with args.
16391-
set dummy $ac_prog; ac_word=$2
16392-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16393-
$as_echo_n "checking for $ac_word... " >&6; }
16394-
if ${ac_cv_path_OSX+:} false; then :
16395-
$as_echo_n "(cached) " >&6
16396-
else
16397-
case $OSX in
16398-
[\\/]* | ?:[\\/]*)
16399-
ac_cv_path_OSX="$OSX" # Let the user override the test with a path.
16400-
;;
16401-
*)
16402-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16403-
for as_dir in $PATH
16404-
do
16405-
IFS=$as_save_IFS
16406-
test -z "$as_dir" && as_dir=.
16407-
for ac_exec_ext in '' $ac_executable_extensions; do
16408-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16409-
ac_cv_path_OSX="$as_dir/$ac_word$ac_exec_ext"
16410-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16411-
break 2
16412-
fi
16413-
done
16414-
done
16415-
IFS=$as_save_IFS
16416-
16417-
;;
16418-
esac
16419-
fi
16420-
OSX=$ac_cv_path_OSX
16421-
if test -n "$OSX"; then
16422-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX" >&5
16423-
$as_echo "$OSX" >&6; }
16424-
else
16425-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16426-
$as_echo "no" >&6; }
16427-
fi
16428-
16429-
16430-
test -n "$OSX" && break
16431-
done
16432-
16433-
else
16434-
# Report the value of OSX in configure's output in all cases.
16435-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX" >&5
16436-
$as_echo_n "checking for OSX... " >&6; }
16437-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX" >&5
16438-
$as_echo "$OSX" >&6; }
16439-
fi
16440-
1644116331
if test -z "$FOP"; then
1644216332
for ac_prog in fop
1644316333
do

‎configure.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,12 +2091,10 @@ fi
20912091
#
20922092
# Check for DocBook and tools
20932093
#
2094-
PGAC_PROG_NSGMLS
2094+
PGAC_PATH_XMLLINT
20952095
PGAC_CHECK_DOCBOOK(4.2)
20962096
PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
2097-
PGAC_PATH_PROGS(XMLLINT, xmllint)
20982097
PGAC_PATH_PROGS(XSLTPROC, xsltproc)
2099-
PGAC_PATH_PROGS(OSX, [osx sgml2xml sx])
21002098
PGAC_PATH_PROGS(FOP, fop)
21012099

21022100
#

0 commit comments

Comments
 (0)