| Gwynne Amaya Raskind 2007-06-27, 7:01 pm |
| gwynne Wed Jun 27 20:24:02 2007 UTC
Modified files:
/phpdoc configure.in
/phpdoc/phpbook/phpbook-xsl html-chunk.xsl param_html.xsl.in
Log:
Add --enable-verbose-xsl to configure; makes XSL builds give a bit more progress information. Disabled by default.
http://cvs.php.net/viewvc.cgi/phpdo...4&diff_format=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.243 phpdoc/configure.in:1.244
--- phpdoc/configure.in:1.243 Thu Jun 7 10:00:02 2007
+++ phpdoc/configure.in Wed Jun 27 20:24:02 2007
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.243 2007/06/07 10:00:02 bjori Exp $
+dnl $Id: configure.in,v 1.244 2007/06/27 20:24:02 gwynne Exp $
dnl autoconf initialisation
AC_INIT()
@@ -494,37 +494,6 @@
AC_SUBST(EXT_SOURCE)
dnl {{{
-AC_MSG_CHECKING([for preferred buildstyle (for partial build)])
-AC_ARG_WITH(buildstyle,
-[ --with-buildstyle=name Which build style to use for partial builds (html|phpweb)],
-[
- case $withval in
- html)
- PARTIAL_STYLESHEET="html.xsl";
- PARTIAL_STYLE="html"
- ;;
- phpweb)
- PARTIAL_STYLESHEET="phpweb.xsl";
- PARTIAL_STYLE="php"
- ;;
- *)
- AC_MSG_RESULT([$withval])
- AC_MSG_ERROR([Only phpweb and html are recognized])
- esac
-
- AC_MSG_RESULT([$withval])
-],[
- PARTIAL_STYLESHEET="html.xsl";
- PARTIAL_STYLE="html"
- AC_MSG_RESULT([html (default)])
-])
-
-AC_SUBST(PARTIAL_STYLESHEET)
-AC_SUBST(PARTIAL_STYLE)
-
-dnl }}}
-
-dnl {{{
AC_MSG_CHECKING(for CSS to use for html docs)
AC_ARG_WITH(htmlcss,
[ --with-htmlcss=URL specify a CSS file to include in html docs],
@@ -801,6 +770,54 @@
dnl }}}
+dnl {{{ additional options
+
+AC_MSG_CHECKING(for verbose XSL builds)
+AC_ARG_ENABLE(verbose-xsl,
+[ --enable-verbose-xsl make XSL targets output more progress information],
+[
+ XSL_PARAM_QUIET=0
+ AC_MSG_RESULT([yes])
+],[
+ XSL_PARAM_QUIET=1
+ AC_MSG_RESULT([no (default)])
+])
+
+AC_SUBST(XSL_PARAM_QUIET)
+
+dnl {{{
+AC_MSG_CHECKING([for preferred buildstyle (for partial build)])
+AC_ARG_WITH(buildstyle,
+[ --with-buildstyle=name Which build style to use for partial builds (html|phpweb)],
+[
+ case $withval in
+ html)
+ PARTIAL_STYLESHEET="html.xsl";
+ PARTIAL_STYLE="html"
+ ;;
+ phpweb)
+ PARTIAL_STYLESHEET="phpweb.xsl";
+ PARTIAL_STYLE="php"
+ ;;
+ *)
+ AC_MSG_RESULT([$withval])
+ AC_MSG_ERROR([Only phpweb and html are recognized])
+ esac
+
+ AC_MSG_RESULT([$withval])
+],[
+ PARTIAL_STYLESHEET="html.xsl";
+ PARTIAL_STYLE="html"
+ AC_MSG_RESULT([html (default)])
+])
+
+AC_SUBST(PARTIAL_STYLESHEET)
+AC_SUBST(PARTIAL_STYLE)
+
+dnl }}}
+
+dnl }}}
+
dnl {{{ makefile targets for configure-generated files
rm -f autogenerated_rules
http://cvs.php.net/viewvc.cgi/phpdo...3&diff_format=u
Index: phpdoc/phpbook/phpbook-xsl/html-chunk.xsl
diff -u phpdoc/phpbook/phpbook-xsl/html-chunk.xsl:1.2 phpdoc/phpbook/phpbook-xsl/html-chunk.xsl:1.3
--- phpdoc/phpbook/phpbook-xsl/html-chunk.xsl:1.2 Wed Mar 28 13:33:46 2007
+++ phpdoc/phpbook/phpbook-xsl/html-chunk.xsl Wed Jun 27 20:24:02 2007
@@ -3,7 +3,7 @@
html-common.xsl: Common HTML customizations
- $Id: html-chunk.xsl,v 1.2 2007/03/28 13:33:46 bjori Exp $
+ $Id: html-chunk.xsl,v 1.3 2007/06/27 20:24:02 gwynne Exp $
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -13,7 +13,8 @@
<xsl:param name="use.id.as.filename" select="1"/>
<!-- Speed up generation (no file name printouts) -->
-<xsl:param name="chunk.quietly">1</xsl:param>
+<!-- <xsl:param name="chunk.quietly">1</xsl:param> -->
+<!-- This is now configured in param_html.xsl -->
<!-- Make LEGALNOTICE an extra-file, omit extra-link on start-page (link
directly from the original <COPYRIGHT> ), and make nav-header/footer -->
http://cvs.php.net/viewvc.cgi/phpdo...2&diff_format=u
Index: phpdoc/phpbook/phpbook-xsl/param_html.xsl.in
diff -u phpdoc/phpbook/phpbook-xsl/param_html.xsl.in:1.1 phpdoc/phpbook/phpbook-xsl/param_html.xsl.in:1.2
--- phpdoc/phpbook/phpbook-xsl/param_html.xsl.in:1.1 Mon Jan 22 14:09:56 2007
+++ phpdoc/phpbook/phpbook-xsl/param_html.xsl.in Wed Jun 27 20:24:02 2007
@@ -3,7 +3,7 @@
param_html.xsl: Parameters generated by the configure-script
- $Id: param_html.xsl.in,v 1.1 2007/01/22 14:09:56 bjori Exp $
+ $Id: param_html.xsl.in,v 1.2 2007/06/27 20:24:02 gwynne Exp $
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -23,4 +23,7 @@
'head' => array('@ENCODING@','@LANG@')</xsl:text>
</xsl:template>
+<!-- Configure verbose printout of progress -->
+<xsl:param name="chunk.quietly">@XSL_PARAM_QUIET@</xsl:param>
+
</xsl:stylesheet>
|