Skip to content

Commit 510074f

Browse files
peterepetere
committed
Remove use of Jade and DSSSL
All documentation is now built using XSLT. Remove all references to Jade, DSSSL, also JadeTex and some other outdated tooling. For chunked HTML builds, this changes nothing, but removes the transitional "oldhtml" target. The single-page HTML build is ported over to XSLT. For PDF builds, this removes the JadeTex builds and moves the FOP builds in their place.
1 parent 3f90235 commit 510074f

16 files changed

+468
-2075
lines changed

‎config/docbook.m4

-62
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
# config/docbook.m4
22

3-
# PGAC_PROG_JADE
4-
# --------------
5-
AC_DEFUN([PGAC_PROG_JADE],
6-
[AC_CHECK_PROGS([JADE], [openjade jade])])
7-
8-
93
# PGAC_PROG_NSGMLS
104
# ----------------
115
AC_DEFUN([PGAC_PROG_NSGMLS],
@@ -44,59 +38,3 @@ rm -f conftest.sgml])
4438
have_docbook=$pgac_cv_check_docbook
4539
AC_SUBST([have_docbook])
4640
])# PGAC_CHECK_DOCBOOK
47-
48-
49-
# PGAC_PATH_DOCBOOK_STYLESHEETS
50-
# -----------------------------
51-
AC_DEFUN([PGAC_PATH_DOCBOOK_STYLESHEETS],
52-
[AC_ARG_VAR(DOCBOOKSTYLE, [location of DocBook stylesheets])dnl
53-
AC_MSG_CHECKING([for DocBook stylesheets])
54-
AC_CACHE_VAL([pgac_cv_path_stylesheets],
55-
[if test -n "$DOCBOOKSTYLE"; then
56-
pgac_cv_path_stylesheets=$DOCBOOKSTYLE
57-
else
58-
for pgac_prefix in /usr /usr/local /opt /sw; do
59-
for pgac_infix in share lib; do
60-
for pgac_postfix in \
61-
sgml/stylesheets/nwalsh-modular \
62-
sgml/stylesheets/docbook \
63-
sgml/stylesheets/dsssl/docbook \
64-
sgml/docbook-dsssl \
65-
sgml/docbook/dsssl/modular \
66-
sgml/docbook/stylesheet/dsssl/modular \
67-
sgml/docbook/dsssl-stylesheets \
68-
sgml/dsssl/docbook-dsssl-nwalsh
69-
do
70-
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
71-
if test -r "$pgac_candidate/html/docbook.dsl" \
72-
&& test -r "$pgac_candidate/print/docbook.dsl"
73-
then
74-
pgac_cv_path_stylesheets=$pgac_candidate
75-
break 3
76-
fi
77-
done
78-
done
79-
done
80-
fi])
81-
DOCBOOKSTYLE=$pgac_cv_path_stylesheets
82-
AC_SUBST([DOCBOOKSTYLE])
83-
if test -n "$DOCBOOKSTYLE"; then
84-
AC_MSG_RESULT([$DOCBOOKSTYLE])
85-
else
86-
AC_MSG_RESULT(no)
87-
fi])# PGAC_PATH_DOCBOOK_STYLESHEETS
88-
89-
90-
# PGAC_PATH_COLLATEINDEX
91-
# ----------------------
92-
# Some DocBook installations provide collateindex.pl in $DOCBOOKSTYLE/bin,
93-
# but it's not necessarily marked executable, so we can't use AC_PATH_PROG
94-
# to check for it there. Other installations just put it in the PATH.
95-
AC_DEFUN([PGAC_PATH_COLLATEINDEX],
96-
[AC_REQUIRE([PGAC_PATH_DOCBOOK_STYLESHEETS])dnl
97-
if test -n "$DOCBOOKSTYLE" -a -r "$DOCBOOKSTYLE/bin/collateindex.pl"; then
98-
COLLATEINDEX="$DOCBOOKSTYLE/bin/collateindex.pl"
99-
AC_SUBST([COLLATEINDEX])
100-
else
101-
AC_PATH_PROG(COLLATEINDEX, collateindex.pl)
102-
fi])# PGAC_PATH_COLLATEINDEX

‎configure

+44-136
Original file line numberDiff line numberDiff line change
@@ -629,14 +629,12 @@ ac_subst_vars='LTLIBOBJS
629629
vpath_build
630630
PG_VERSION_NUM
631631
PROVE
632+
FOP
632633
OSX
633634
XSLTPROC
634635
XMLLINT
635636
DBTOEPUB
636-
COLLATEINDEX
637-
DOCBOOKSTYLE
638637
have_docbook
639-
JADE
640638
NSGMLS
641639
TCL_SHLIB_LD_LIBS
642640
TCL_SHARED_BUILD
@@ -869,8 +867,7 @@ PKG_CONFIG_LIBDIR
869867
ICU_CFLAGS
870868
ICU_LIBS
871869
LDFLAGS_EX
872-
LDFLAGS_SL
873-
DOCBOOKSTYLE'
870+
LDFLAGS_SL'
874871

875872

876873
# Initialize some variables set by options.
@@ -1568,8 +1565,6 @@ Some influential environment variables:
15681565
ICU_LIBS linker flags for ICU, overriding pkg-config
15691566
LDFLAGS_EX extra linker flags for linking executables only
15701567
LDFLAGS_SL extra linker flags for linking shared libraries only
1571-
DOCBOOKSTYLE
1572-
location of DocBook stylesheets
15731568
15741569
Use these variables to override the choices made by `configure' or to help
15751570
it to find libraries and programs with nonstandard names/locations.
@@ -15951,48 +15946,6 @@ fi
1595115946
test -n "$NSGMLS" && break
1595215947
done
1595315948

15954-
for ac_prog in openjade jade
15955-
do
15956-
# Extract the first word of "$ac_prog", so it can be a program name with args.
15957-
set dummy $ac_prog; ac_word=$2
15958-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15959-
$as_echo_n "checking for $ac_word... " >&6; }
15960-
if ${ac_cv_prog_JADE+:} false; then :
15961-
$as_echo_n "(cached) " >&6
15962-
else
15963-
if test -n "$JADE"; then
15964-
ac_cv_prog_JADE="$JADE" # Let the user override the test.
15965-
else
15966-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15967-
for as_dir in $PATH
15968-
do
15969-
IFS=$as_save_IFS
15970-
test -z "$as_dir" && as_dir=.
15971-
for ac_exec_ext in '' $ac_executable_extensions; do
15972-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
15973-
ac_cv_prog_JADE="$ac_prog"
15974-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15975-
break 2
15976-
fi
15977-
done
15978-
done
15979-
IFS=$as_save_IFS
15980-
15981-
fi
15982-
fi
15983-
JADE=$ac_cv_prog_JADE
15984-
if test -n "$JADE"; then
15985-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JADE" >&5
15986-
$as_echo "$JADE" >&6; }
15987-
else
15988-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15989-
$as_echo "no" >&6; }
15990-
fi
15991-
15992-
15993-
test -n "$JADE" && break
15994-
done
15995-
1599615949

1599715950
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook V4.2" >&5
1599815951
$as_echo_n "checking for DocBook V4.2... " >&6; }
@@ -16029,93 +15982,6 @@ $as_echo "$pgac_cv_check_docbook" >&6; }
1602915982
have_docbook=$pgac_cv_check_docbook
1603015983

1603115984

16032-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook stylesheets" >&5
16033-
$as_echo_n "checking for DocBook stylesheets... " >&6; }
16034-
if ${pgac_cv_path_stylesheets+:} false; then :
16035-
$as_echo_n "(cached) " >&6
16036-
else
16037-
if test -n "$DOCBOOKSTYLE"; then
16038-
pgac_cv_path_stylesheets=$DOCBOOKSTYLE
16039-
else
16040-
for pgac_prefix in /usr /usr/local /opt /sw; do
16041-
for pgac_infix in share lib; do
16042-
for pgac_postfix in \
16043-
sgml/stylesheets/nwalsh-modular \
16044-
sgml/stylesheets/docbook \
16045-
sgml/stylesheets/dsssl/docbook \
16046-
sgml/docbook-dsssl \
16047-
sgml/docbook/dsssl/modular \
16048-
sgml/docbook/stylesheet/dsssl/modular \
16049-
sgml/docbook/dsssl-stylesheets \
16050-
sgml/dsssl/docbook-dsssl-nwalsh
16051-
do
16052-
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
16053-
if test -r "$pgac_candidate/html/docbook.dsl" \
16054-
&& test -r "$pgac_candidate/print/docbook.dsl"
16055-
then
16056-
pgac_cv_path_stylesheets=$pgac_candidate
16057-
break 3
16058-
fi
16059-
done
16060-
done
16061-
done
16062-
fi
16063-
fi
16064-
16065-
DOCBOOKSTYLE=$pgac_cv_path_stylesheets
16066-
16067-
if test -n "$DOCBOOKSTYLE"; then
16068-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCBOOKSTYLE" >&5
16069-
$as_echo "$DOCBOOKSTYLE" >&6; }
16070-
else
16071-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16072-
$as_echo "no" >&6; }
16073-
fi
16074-
if test -n "$DOCBOOKSTYLE" -a -r "$DOCBOOKSTYLE/bin/collateindex.pl"; then
16075-
COLLATEINDEX="$DOCBOOKSTYLE/bin/collateindex.pl"
16076-
16077-
else
16078-
# Extract the first word of "collateindex.pl", so it can be a program name with args.
16079-
set dummy collateindex.pl; ac_word=$2
16080-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16081-
$as_echo_n "checking for $ac_word... " >&6; }
16082-
if ${ac_cv_path_COLLATEINDEX+:} false; then :
16083-
$as_echo_n "(cached) " >&6
16084-
else
16085-
case $COLLATEINDEX in
16086-
[\\/]* | ?:[\\/]*)
16087-
ac_cv_path_COLLATEINDEX="$COLLATEINDEX" # Let the user override the test with a path.
16088-
;;
16089-
*)
16090-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16091-
for as_dir in $PATH
16092-
do
16093-
IFS=$as_save_IFS
16094-
test -z "$as_dir" && as_dir=.
16095-
for ac_exec_ext in '' $ac_executable_extensions; do
16096-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16097-
ac_cv_path_COLLATEINDEX="$as_dir/$ac_word$ac_exec_ext"
16098-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16099-
break 2
16100-
fi
16101-
done
16102-
done
16103-
IFS=$as_save_IFS
16104-
16105-
;;
16106-
esac
16107-
fi
16108-
COLLATEINDEX=$ac_cv_path_COLLATEINDEX
16109-
if test -n "$COLLATEINDEX"; then
16110-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COLLATEINDEX" >&5
16111-
$as_echo "$COLLATEINDEX" >&6; }
16112-
else
16113-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16114-
$as_echo "no" >&6; }
16115-
fi
16116-
16117-
16118-
fi
1611915985
for ac_prog in dbtoepub
1612015986
do
1612115987
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -16284,6 +16150,48 @@ fi
1628416150
test -n "$OSX" && break
1628516151
done
1628616152

16153+
for ac_prog in fop
16154+
do
16155+
# Extract the first word of "$ac_prog", so it can be a program name with args.
16156+
set dummy $ac_prog; ac_word=$2
16157+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16158+
$as_echo_n "checking for $ac_word... " >&6; }
16159+
if ${ac_cv_prog_FOP+:} false; then :
16160+
$as_echo_n "(cached) " >&6
16161+
else
16162+
if test -n "$FOP"; then
16163+
ac_cv_prog_FOP="$FOP" # Let the user override the test.
16164+
else
16165+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16166+
for as_dir in $PATH
16167+
do
16168+
IFS=$as_save_IFS
16169+
test -z "$as_dir" && as_dir=.
16170+
for ac_exec_ext in '' $ac_executable_extensions; do
16171+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16172+
ac_cv_prog_FOP="$ac_prog"
16173+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16174+
break 2
16175+
fi
16176+
done
16177+
done
16178+
IFS=$as_save_IFS
16179+
16180+
fi
16181+
fi
16182+
FOP=$ac_cv_prog_FOP
16183+
if test -n "$FOP"; then
16184+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
16185+
$as_echo "$FOP" >&6; }
16186+
else
16187+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16188+
$as_echo "no" >&6; }
16189+
fi
16190+
16191+
16192+
test -n "$FOP" && break
16193+
done
16194+
1628716195

1628816196
#
1628916197
# Check for test tools

‎configure.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -2117,14 +2117,12 @@ fi
21172117
# Check for DocBook and tools
21182118
#
21192119
PGAC_PROG_NSGMLS
2120-
PGAC_PROG_JADE
21212120
PGAC_CHECK_DOCBOOK(4.2)
2122-
PGAC_PATH_DOCBOOK_STYLESHEETS
2123-
PGAC_PATH_COLLATEINDEX
21242121
AC_CHECK_PROGS(DBTOEPUB, dbtoepub)
21252122
AC_CHECK_PROGS(XMLLINT, xmllint)
21262123
AC_CHECK_PROGS(XSLTPROC, xsltproc)
21272124
AC_CHECK_PROGS(OSX, [osx sgml2xml sx])
2125+
AC_CHECK_PROGS(FOP, fop)
21282126

21292127
#
21302128
# Check for test tools

‎doc/src/sgml/.gitignore

-8
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616
/features-unsupported.sgml
1717
/errcodes-table.sgml
1818
/version.sgml
19-
/bookindex.sgml
20-
/HTML.index
2119
# Assorted byproducts from building the above
2220
/postgres.xml
2321
/INSTALL.html
2422
/INSTALL.xml
25-
/postgres-US.aux
26-
/postgres-US.log
27-
/postgres-US.out
28-
/postgres-A4.aux
29-
/postgres-A4.log
30-
/postgres-A4.out

0 commit comments

Comments
 (0)