goba Sat Aug 3 12:11:16 2002 EDT
Modified files:
/phpdoc configure.in Makefile.in
Log:
Adding support for xsltproc (in place of java support, which was never
used, and was there to support future XSLT processors). Also adding two
new makefile targets (currently without any dependencies):
make html_xsl and make chm_xsl
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.169 phpdoc/configure.in:1.170
--- phpdoc/configure.in:1.169 Sat Aug 3 08:55:26 2002
+++ phpdoc/configure.in Sat Aug 3 12:11:16 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.169 2002/08/03 12:55:26 goba Exp $
+dnl $Id: configure.in,v 1.170 2002/08/03 16:11:16 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -166,50 +166,34 @@
dnl }}}
-dnl {{{ check for Java
+dnl {{{ check for xsltproc
dnl use given argument, if any, else search in path
-AC_ARG_WITH(java,
-[ --with-java=PATH Look for Java runtime],
+AC_ARG_WITH(xsltproc,
+[ --with-xsltproc=PATH Look for xsltproc],
[
if test $withval != "yes"; then
- AC_MSG_CHECKING([for java])
+ AC_MSG_CHECKING([for xsltproc])
if test -x $withval -a -f $withval
then
- JAVA=$withval
- AC_MSG_RESULT($JAVA)
- elif test -x $withval/bin/java
- then
- JAVA=$withval/bin/java
- AC_MSG_RESULT($JAVA)
- elif test -x $withval/bin/jre
- then
- JAVA=$withval/bin/java
- AC_MSG_RESULT($JAVA)
+ XSLTPROC=$withval
+ AC_MSG_RESULT($XSLTPROC)
else
- JAVA=no
+ XSLTPROC=no
AC_MSG_RESULT(no)
- AC_MSG_ERROR([$withval: no java binary found])
+ AC_MSG_ERROR([$withval: no xsltproc binary found])
fi
else
- AC_PATH_PROG(JAVA,"java",no)
- if test "$JAVA" = "no"; then
- AC_PATH_PROG(JRE,"jre",no)
- JAVA=$JRE
- fi
+ AC_PATH_PROG(XSLTPROC,"xsltproc",no)
fi
],[
- AC_PATH_PROGS(JAVA,"java jre",no)
- if test "$JAVA" = "no"; then
- AC_PATH_PROG(JRE,"jre",no)
- JAVA=$JRE
- fi
+ AC_PATH_PROGS(XSLTPROC,"xsltproc",no)
]
)
-if test $JAVA = "no"; then
- AC_MSG_WARN([no Java runtime found])
+if test $XSLTPROC = "no"; then
+ AC_MSG_WARN(["no xsltproc binary found, XSL Transformations won't work"])
fi
-AC_SUBST(JAVA)
+AC_SUBST(XSLTPROC)
dnl }}}
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.122 phpdoc/Makefile.in:1.123
--- phpdoc/Makefile.in:1.122 Sat Jul 27 09:43:12 2002
+++ phpdoc/Makefile.in Sat Aug 3 12:11:16 2002
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.122 2002/07/27 13:43:12 goba Exp $
+# $Id: Makefile.in,v 1.123 2002/08/03 16:11:16 goba Exp $
#
all: html
@@ -31,6 +31,7 @@
JADE=@SP_OPTIONS@ @JADE@ -D . -wno-idref
NSGMLS=@SP_OPTIONS@ @NSGMLS@
PHP=@PHP@
+XSLTPROC=@XSLTPROC@
CATALOG=@CATALOG@
@@ -43,6 +44,9 @@
KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
+HTML_XSL_SHEET=xsl/html.xsl
+CHM_XSL_SHEET=xsl/htmlhelp.xsl
+
BIGHTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in zendapi
HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in zendapihtml
HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in howto/howto.ent
@@ -154,6 +158,15 @@
@test -d html || mkdir html
$(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml $(XMLDCL)
manual.xml
+# still needs more tweaks!!
+html_xsl: manual.xml
+ @test -d html || mkdir html
+ ${XSLTPROC} $(HTML_XSL_SHEET) manual.xml
+
+chm_xsl: manual.xml
+ @test -d ./htmlhelp/html || mkdir ./htmlhelp/html
+ ${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
+
php/index.php: manual.xml $(PHPWEB_DEPS)
@test -d php || mkdir php
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
@@ -231,7 +244,6 @@
-jadetex $<
-jadetex $<
-jadetex $<
-
# {{{ tests
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
