[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
bjori Thu Jun 7 10:00:02 2007 UTC
Modified files:
/phpdoc Makefile.in configure.in
Log:
Add partial build target
# The xsl stylesheet is controled by passing --with-buildstyle=html|phpweb
# to ./configure, default is html
#
# Usage: make part/
# i.e. : make part/function.strpos part/language.oop5 part/ref.filter
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.192&r2=1.193&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.192 phpdoc/Makefile.in:1.193
--- phpdoc/Makefile.in:1.192Tue Feb 20 21:17:39 2007
+++ phpdoc/Makefile.in Thu Jun 7 10:00:02 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.192 2007/02/20 21:17:39 colder Exp $
+# $Id: Makefile.in,v 1.193 2007/06/07 10:00:02 bjori Exp $
#
all: html
@@ -39,7 +39,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
[EMAIL PROTECTED]@
PHPBOOK=phpbook
PHPDSSSL=$(PHPBOOK)/phpbook-dsssl
@@ -59,6 +59,7 @@
HOWTO_XSL_SHEET=$(PHPXSL)/howto.xsl
QUICKREF_XSL_SHEET=$(PHPXSL)/quickref.xsl
XUL_XSL_SHEET=$(PHPXSL)/htmlhelp.xsl
+PARTIAL_STYLESHEET=$(PHPXSL)/@PARTIAL_STYLESHEET@
BIGHTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in images
HTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in images_html
@@ -324,6 +325,13 @@
-jadetex $<
-jadetex $<
+# {{{ partial builds
+part/%: manual.xml
+ @if test ! -d $(PARTIAL_STYLE); then mkdir $(PARTIAL_STYLE); fi
+ ${XSLTPROC} --stringparam rootid $(@F) $(PARTIAL_STYLESHEET) manual.xml
+ $(PHP) -q $(scriptdir)/html_syntax.php $(PARTIAL_STYLE) xsl
$(PARTIAL_STYLE)/
+# }}}
+
# {{{ tests
# test all possible errors
http://cvs.php.net/viewvc.cgi/phpdoc/configure.in?r1=1.242&r2=1.243&diff_format=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.242 phpdoc/configure.in:1.243
--- phpdoc/configure.in:1.242 Tue Mar 20 10:44:18 2007
+++ phpdoc/configure.in Thu Jun 7 10:00:02 2007
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.242 2007/03/20 10:44:18 bjori Exp $
+dnl $Id: configure.in,v 1.243 2007/06/07 10:00:02 bjori Exp $
dnl autoconf initialisation
AC_INIT()
@@ -494,6 +494,37 @@
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],
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
bjori Mon Jan 22 16:01:21 2007 UTC
Modified files:
/phpdoc Makefile.in configure.in
Log:
Update paths
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.176&r2=1.177&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.176 phpdoc/Makefile.in:1.177
--- phpdoc/Makefile.in:1.176Fri Jan 19 20:14:12 2007
+++ phpdoc/Makefile.in Mon Jan 22 16:01:20 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.176 2007/01/19 20:14:12 bjori Exp $
+# $Id: Makefile.in,v 1.177 2007/01/22 16:01:20 bjori Exp $
#
all: html
@@ -40,25 +40,32 @@
[EMAIL PROTECTED]@
-HTML_STYLESHEET=dsssl/html.dsl
-PHPWEB_STYLESHEET=dsssl/phpweb.dsl
-HOWTO_STYLESHEET=dsssl/howto.dsl
-HOWTOPHP_STYLESHEET=dsssl/howto-php.dsl
-PRINT_STYLESHEET=dsssl/print.dsl
-KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
-XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
-
-CHM_XSL_SHEET=xsl/htmlhelp.xsl
-HOWTO_XSL_SHEET=xsl/howto.xsl
-QUICKREF_XSL_SHEET=xsl/quickref.xsl
-XUL_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) $(HOWTOPHP_STYLESHEET) dsssl/html-common.dsl
dsssl/html-locale.dsl.in dsssl/common.dsl.in howto/howto.ent
-PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in zendapi
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl
zendapiphp
-KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile
+
+PHPBOOK=phpbook
+PHPDSSSL=$(PHPBOOK)/phpbook-dsssl
+PHPXML=$(PHPBOOK)/phpbook-xml
+PHPXSL=$(PHPBOOK)/phpbook-xsl
+
+HTML_STYLESHEET=$(PHPDSSSL)/html.dsl
+PHPWEB_STYLESHEET=$(PHPDSSSL)/phpweb.dsl
+HOWTO_STYLESHEET=$(PHPDSSSL)/howto.dsl
+HOWTOPHP_STYLESHEET=$(PHPDSSSL)/howto-php.dsl
+PRINT_STYLESHEET=$(PHPDSSSL)/print.dsl
+KDEVELOP_TOC_STYLESHEET=$(PHPDSSSL)/kdevelop_toc.dsl
+
+XMLDCL=$(PHPXML)/phpdocxml.dcl
+
+CHM_XSL_SHEET=$(PHPXSL)/htmlhelp.xsl
+HOWTO_XSL_SHEET=$(PHPXSL)/howto.xsl
+QUICKREF_XSL_SHEET=$(PHPXSL)/quickref.xsl
+XUL_XSL_SHEET=$(PHPXSL)/htmlhelp.xsl
+
+BIGHTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in zendapi
+HTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in zendapihtml
+HOWTO_DEPS=$(HOWTO_STYLESHEET) $(HOWTOPHP_STYLESHEET)
$(PHPDSSSL)/html-common.dsl $(PHPDSSSL)/html-locale.dsl.in
$(PHPDSSSL)/common.dsl.in howto/howto.ent
+PRINT_DEPS=$(PRINT_STYLESHEET) $(PHPDSSSL)/common.dsl.in
$(PHPDSSSL)/print.dsl.in zendapi
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/common.dsl zendapiphp
+KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile
[EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED]
MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES)
@@ -201,16 +208,16 @@
# still needs more tweaks!!
html_xsl: manual.xml zendapihtml
- ${XSLTPROC} xsl/html.xsl manual.xml
+ ${XSLTPROC} $(PHPXSL)/html.xsl manual.xml
xul_xsl: manual.xml zendapixul
${XSLTPROC} xsl/xul.xsl manual.xml
bightml_xsl: manual.xml zendapi
- ${XSLTPROC} -o @[EMAIL PROTECTED] xsl/bightml.xsl manual.xml
+ ${XSLTPROC} -o @[EMAIL PROTECTED] $(PHPXSL)/bightml.xsl manual.xml
fo: manual.xml zendapi
- ${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
+ ${XSLTPROC} -o manual.fo $(PHPXSL)/fo.xsl manual.xml
howto_xsl:
rm -rf ./howto/html && mkdir ./howto/html
@@ -220,7 +227,7 @@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
- ${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
+ ${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
@@ -263,7 +270,7 @@
tar -cvzf $@ howto/html/*.html
install.html: install.xml $(HTML_DEPS)
- $(JADE) $(CATALOG) -V nochunks -d dsssl/install.dsl -t sgml $(XMLDCL)
install.xml > $@
+ $(JADE) $(CATALOG) -V nochunks -d $(PHPDSSSL)/install.dsl -t sgml
$(XMLDCL) install.xml > $@
chm: html FORCE
chm/make_chm.bat $(LANG)
http://cvs.php.net/viewvc.cgi/phpdoc/configure.in?r1=1.238&r2=1.239&diff_format=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.238 phpdoc/configure.in:1.239
--- phpdoc/configure.in:1.238 Fri Sep 29 16:37:40 2006
+++ phpdoc/configure.in Mon Jan 22 16:01:20 2007
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.238 2006/09/29 16:37:40 nlopess Exp $
+dnl $Id: configure.in,v 1.239 2007/01/22 16:01:20 bjori Exp $
dnl autoconf initialisation
AC_INIT()
@@ -315,9 +315,9 @@
AC_MSG_RESULT(in $withval)
fi
],[
- DOCBOOK_HTML="$srcdir/dsssl/docbook/html/docbook.dsl"
- DOCBOOK_PRINT="$srcdir/dsssl/docbook/print/docbook.dsl"
- AC_MSG_RESULT([$srcdir/dsssl/docbook (default)])
+ DOCBOOK_HTML="$srcdir/docbook/docbook-dsssl/html
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
On Sun, 20 Mar 2005, Gabor Hojtsy wrote: Hmmm??? You removed the possibility for languages to specify their encoding? Or do I miss something? Yeah, nothing bad - we'll generate utf-8 for all manuals from now. Derick Anyway I still left some encoding stuff in the configure file because of chms. It seems that not all chms are being built in UTF-8. (xsl/htmlhelp-config.xsl.in) Maybe this could also be changed. Nuno
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
Hmmm??? You removed the possibility for languages to specify their encoding? Or do I miss something? Yeah, nothing bad - we'll generate utf-8 for all manuals from now. Nope, it is not all utf8 yet, I just noticed the wildcard for unspecified language to be treated as utf8... Goba
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
On Sun, 20 Mar 2005, Gabor Hojtsy wrote: > Hmmm??? You removed the possibility for languages to specify their > encoding? Or do I miss something? Yeah, nothing bad - we'll generate utf-8 for all manuals from now. Derick
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
case "$LANG" in - ja|ko|pt_BR|pl|ru) ENCODING="UTF-8";; zh_tw|zh_hk) ENCODING="big5";; zh_cn) ENCODING="gb2312";; cs|hu|ro|sk) ENCODING="ISO-8859-2";; @@ -729,7 +728,6 @@ if test "$LANG_HACK_FOR_HE" = "yes"; then ENCODING="ISO-8859-8" fi -AC_SUBST(ENCODING) dnl localize the PalmPilot DOC title case "$LANG" in @@ -766,6 +764,8 @@ ;; esac +ENCODING="UTF-8" +AC_SUBST(ENCODING) AC_SUBST(SP_OPTIONS) Hmmm??? You removed the possibility for languages to specify their encoding? Or do I miss something? Goba
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
nlopess Sun Mar 20 09:49:17 2005 EDT
Modified files:
/phpdoc Makefile.in configure.in
Log:
try to fix remaining encoding issues
fix xchm/xsl generation
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.162&r2=1.163&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.162 phpdoc/Makefile.in:1.163
--- phpdoc/Makefile.in:1.162Tue Mar 8 14:51:13 2005
+++ phpdoc/Makefile.in Sun Mar 20 09:49:17 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.162 2005/03/08 19:51:13 nlopess Exp $
+# $Id: Makefile.in,v 1.163 2005/03/20 14:49:17 nlopess Exp $
#
all: html
@@ -190,8 +190,11 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
chm_xsl: manual.xml
- rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
./htmlhelp/html/@FIGURES@
- @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
+ rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
+ @if test "@FIGURES@" != ""; then \
+ mkdir ./htmlhelp/html/@FIGURES@ ;\
+ @ZEND_FIGURES@/htmlhelp/html/@FIGURES@ ;\
+ fi
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.222&r2=1.223&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.222 phpdoc/configure.in:1.223
--- phpdoc/configure.in:1.222 Wed Mar 16 03:11:47 2005
+++ phpdoc/configure.in Sun Mar 20 09:49:17 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.222 2005/03/16 08:11:47 leszek Exp $
+dnl $Id: configure.in,v 1.223 2005/03/20 14:49:17 nlopess Exp $
dnl autoconf initialisation
AC_INIT()
@@ -716,7 +716,6 @@
echo "saving trees: $TREESAVING";
case "$LANG" in
- ja|ko|pt_BR|pl|ru) ENCODING="UTF-8";;
zh_tw|zh_hk) ENCODING="big5";;
zh_cn) ENCODING="gb2312";;
cs|hu|ro|sk) ENCODING="ISO-8859-2";;
@@ -729,7 +728,6 @@
if test "$LANG_HACK_FOR_HE" = "yes"; then
ENCODING="ISO-8859-8"
fi
-AC_SUBST(ENCODING)
dnl localize the PalmPilot DOC title
case "$LANG" in
@@ -766,6 +764,8 @@
;;
esac
+ENCODING="UTF-8"
+AC_SUBST(ENCODING)
AC_SUBST(SP_OPTIONS)
AC_SUBST(HTMLHELP_ENCODING)
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
||*()*|| Hi, phpdoc.
Can anybody familiar with *nix maketools tell me - when make rebuilds
some target - does it rebuild target's dependencies?
at> techtonik Thu Mar 3 15:42:32 2005 EDT
at> Modified files:
at> /phpdoc configure.in Makefile.in
at> Log:
at> fix bug #31932 : images are missing in the manual
at> http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.218&r2=1.219&ty=u
at> Index: phpdoc/configure.in
at> diff -u phpdoc/configure.in:1.218 phpdoc/configure.in:1.219
at> --- phpdoc/configure.in:1.218 Tue Mar 1 12:28:40 2005
at> +++ phpdoc/configure.in Thu Mar 3 15:42:30 2005
at> @@ -1,4 +1,4 @@
at> -dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
at> +dnl $Id: configure.in,v 1.219 2005/03/03 20:42:30 techtonik Exp $
at> dnl autoconf initialisation
at> AC_INIT()
at> @@ -524,15 +524,15 @@
at> ])
at> if test -d "$ZENDAPI"; then
at> - ZEND_FIGURES="cp -r $ZENDAPI/figures ."
at> - ZEND_FIGURES_HTML="$ZEND_FIGURES/html"
at> - ZEND_FIGURES_PHP="$ZEND_FIGURES/php"
at>FIGURES="figures"
at> + ZEND_FIGURES="cp $ZENDAPI/figures/*.png ."
at> + ZEND_FIGURES_HTML="$ZEND_FIGURES/html/$FIGURES"
at> + ZEND_FIGURES_PHP="$ZEND_FIGURES/php/$FIGURES"
at> else
at> + FIGURES=""
at>ZEND_FIGURES=""
at>ZEND_FIGURES_HTML=""
at>ZEND_FIGURES_PHP=""
at> - FIGURES=""
at> fi
at> AC_MSG_RESULT($ZENDAPI)
at> http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.159&r2=1.160&ty=u
at> Index: phpdoc/Makefile.in
at> diff -u phpdoc/Makefile.in:1.159 phpdoc/Makefile.in:1.160
at> --- phpdoc/Makefile.in:1.159Fri Feb 11 10:57:49 2005
at> +++ phpdoc/Makefile.in Thu Mar 3 15:42:31 2005
at> @@ -16,7 +16,7 @@
at> #
at> #
at> -# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
at> +# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
at> #
at> all: html
at> @@ -84,11 +84,11 @@
at> @ZEND_FIGURES@
at> zendapihtml:
at> - rm -rf html && mkdir html
at> + rm -rf html && mkdir html && mkdir html/@FIGURES@
at> @ZEND_FIGURES_HTML@
at> zendapiphp:
at> - rm -rf php && mkdir php
at> + rm -rf php && mkdir php && mkdir php/@FIGURES@
at> @ZEND_FIGURES_PHP@
at> html: html/index.html
at> @@ -167,8 +167,6 @@
at> @[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
at> html/index.html: manual.xml $(HTML_DEPS)
at> - rm -rf html && mkdir html
at> - @ZEND_FIGURES_HTML@
at> $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
at> $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
at> $(PHP) -q $(scriptdir)/html_syntax.php html html/
at> @@ -177,8 +175,6 @@
at> # still needs more tweaks!!
at> html_xsl: manual.xml zendapihtml
at> - rm -rf html && mkdir html
at> - @ZEND_FIGURES_HTML@
at> ${XSLTPROC} xsl/html.xsl manual.xml
at> bightml_xsl: manual.xml zendapi
at> @@ -192,17 +188,16 @@
at> ${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
at> chm_xsl: manual.xml
at> - rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
at> + rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
./htmlhelp/html/@FIGURES@
at> + @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
at> ${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
at> phpweb_xsl: manual.xml zendapiphp
at> - rm -rf php && mkdir php
at> ${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
at> $(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
at> php/index.php: manual.xml $(PHPWEB_DEPS)
at> $(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
at> - rm -rf php && mkdir php
at> $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
at> -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t
sgml $(XMLDCL) manual.xml
at> $(PHP) -q $(scriptdir)/html_syntax.php php php/
t
--
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
techtonik Thu Mar 3 15:42:32 2005 EDT
Modified files:
/phpdoc configure.in Makefile.in
Log:
fix bug #31932 : images are missing in the manual
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.218&r2=1.219&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.218 phpdoc/configure.in:1.219
--- phpdoc/configure.in:1.218 Tue Mar 1 12:28:40 2005
+++ phpdoc/configure.in Thu Mar 3 15:42:30 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
+dnl $Id: configure.in,v 1.219 2005/03/03 20:42:30 techtonik Exp $
dnl autoconf initialisation
AC_INIT()
@@ -524,15 +524,15 @@
])
if test -d "$ZENDAPI"; then
- ZEND_FIGURES="cp -r $ZENDAPI/figures ."
- ZEND_FIGURES_HTML="$ZEND_FIGURES/html"
- ZEND_FIGURES_PHP="$ZEND_FIGURES/php"
FIGURES="figures"
+ ZEND_FIGURES="cp $ZENDAPI/figures/*.png ."
+ ZEND_FIGURES_HTML="$ZEND_FIGURES/html/$FIGURES"
+ ZEND_FIGURES_PHP="$ZEND_FIGURES/php/$FIGURES"
else
+ FIGURES=""
ZEND_FIGURES=""
ZEND_FIGURES_HTML=""
ZEND_FIGURES_PHP=""
- FIGURES=""
fi
AC_MSG_RESULT($ZENDAPI)
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.159&r2=1.160&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.159 phpdoc/Makefile.in:1.160
--- phpdoc/Makefile.in:1.159Fri Feb 11 10:57:49 2005
+++ phpdoc/Makefile.in Thu Mar 3 15:42:31 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
+# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
#
all: html
@@ -84,11 +84,11 @@
@ZEND_FIGURES@
zendapihtml:
- rm -rf html && mkdir html
+ rm -rf html && mkdir html && mkdir html/@FIGURES@
@ZEND_FIGURES_HTML@
zendapiphp:
- rm -rf php && mkdir php
+ rm -rf php && mkdir php && mkdir php/@FIGURES@
@ZEND_FIGURES_PHP@
html: html/index.html
@@ -167,8 +167,6 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
html/index.html: manual.xml $(HTML_DEPS)
- rm -rf html && mkdir html
- @ZEND_FIGURES_HTML@
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
$(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php html html/
@@ -177,8 +175,6 @@
# still needs more tweaks!!
html_xsl: manual.xml zendapihtml
- rm -rf html && mkdir html
- @ZEND_FIGURES_HTML@
${XSLTPROC} xsl/html.xsl manual.xml
bightml_xsl: manual.xml zendapi
@@ -192,17 +188,16 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
chm_xsl: manual.xml
- rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
+ rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
./htmlhelp/html/@FIGURES@
+ @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
- rm -rf php && mkdir php
${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
- rm -rf php && mkdir php
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php php php/
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in /scripts file-entities.php.in missing-entities.php.in
hholzgraWed Feb 9 18:46:00 2005 EDT
Modified files:
/phpdoc Makefile.in configure.in manual.xml.in
/phpdoc/scripts file-entities.php.in missing-entities.php.in
Log:
some changes that allow configure to be run in a different directory
so that several different manual builds can be done from just one
source repository
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.157&r2=1.158&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.157 phpdoc/Makefile.in:1.158
--- phpdoc/Makefile.in:1.157Mon Nov 15 14:17:56 2004
+++ phpdoc/Makefile.in Wed Feb 9 18:45:58 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.157 2004/11/15 19:17:56 techtonik Exp $
+# $Id: Makefile.in,v 1.158 2005/02/09 23:45:58 hholzgra Exp $
#
all: html
@@ -292,20 +292,20 @@
test: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
# ignore missing IDs and check if the manual can be generated anyway
test_man_gen: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml
test_xml: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(XMLLINT) --noent --noout --valid manual.xml
test_howto:
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.214&r2=1.215&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.214 phpdoc/configure.in:1.215
--- phpdoc/configure.in:1.214 Tue Feb 8 13:22:33 2005
+++ phpdoc/configure.in Wed Feb 9 18:45:59 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.214 2005/02/08 18:22:33 hholzgra Exp $
+dnl $Id: configure.in,v 1.215 2005/02/09 23:45:59 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -844,7 +844,7 @@
fi
done
AC_OUTPUT($OUTFILES)
-find . -name "*.sh" | xargs chmod u+x
+find $srcdir -name "*.sh" | tee find.log | xargs chmod u+x
dnl }}}
dnl {{{ create default empty phpweb.ent file
@@ -865,7 +865,7 @@
dnl create missing-entities.ent and missing-ids.xml
rm -f entities/missing*
- rm -f $LANGDIR/missing-ids.xml
+ rm -f entities/missing-ids.xml
$PHP -c $INIPATH -q ./scripts/missing-entities.php
else
http://cvs.php.net/diff.php/phpdoc/manual.xml.in?r1=1.204&r2=1.205&ty=u
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.204 phpdoc/manual.xml.in:1.205
--- phpdoc/manual.xml.in:1.204 Wed Feb 9 05:33:53 2005
+++ phpdoc/manual.xml.inWed Feb 9 18:45:59 2005
@@ -2,7 +2,7 @@
+
@@ -28,7 +28,7 @@
-
+
http://cvs.php.net/diff.php/phpdoc/scripts/file-entities.php.in?r1=1.30&r2=1.31&ty=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.30
phpdoc/scripts/file-entities.php.in:1.31
--- phpdoc/scripts/file-entities.php.in:1.30Wed Feb 9 18:05:05 2005
+++ phpdoc/scripts/file-entities.php.in Wed Feb 9 18:46:00 2005
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+--+
- $Id: file-entities.php.in,v 1.30 2005/02/09 23:05:05 hholzgra Exp $
+ $Id: file-entities.php.in,v 1.31 2005/02/09 23:46:00 hholzgra Exp $
*/
/**
@@ -444,11 +444,11 @@
*/
function create_part_file ($filename, $entities, $id, $title)
{
- global $srcdir, $encoding;
+ global $out_dir, $encoding;
sort($entities);
- $fp = fopen("$srcdir/$filename","w");
+ $fp = fopen("$out_dir/$filename","w");
fputs($fp, "\n");
fputs($fp, "\n");
if(count($entities)) {
http://cvs.php.net/diff.php/phpdoc/scripts/missing-entities.php.in?r1=1.16&r2=1.17&ty=u
Index: phpdoc/scripts/missing-entities.php.in
diff -u phpdoc/scripts/missing-entities.php.in:1.16
phpdoc/scripts/missing-entities.php.in:1.17
--- phpdoc/scripts/missing-entities.php.in:1.16 Thu Dec 23 15:58:07 2004
+++ phpdoc/scripts/missing-entities.php.in Wed Feb 9 18:46:00 2005
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+--
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
derick Mon Nov 1 16:12:11 2004 EDT Modified files: /phpdoc Makefile.in configure.in Log: - Added support for UTF 8 charset. http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.154&r2=1.155&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.154 phpdoc/Makefile.in:1.155 --- phpdoc/Makefile.in:1.154Tue Oct 5 07:16:52 2004 +++ phpdoc/Makefile.in Mon Nov 1 16:12:09 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.154 2004/10/05 11:16:52 techtonik Exp $ +# $Id: Makefile.in,v 1.155 2004/11/01 21:12:09 derick Exp $ # all: html @@ -58,7 +58,7 @@ PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile [EMAIL PROTECTED]@.tar.bz2 @[EMAIL PROTECTED] @[EMAIL PROTECTED] [EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED] MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES) #MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES) http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.205&r2=1.206&ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.205 phpdoc/configure.in:1.206 --- phpdoc/configure.in:1.205 Sun Sep 19 08:59:30 2004 +++ phpdoc/configure.in Mon Nov 1 16:12:10 2004 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.205 2004/09/19 12:59:30 techtonik Exp $ +dnl $Id: configure.in,v 1.206 2004/11/01 21:12:10 derick Exp $ dnl autoconf initialisation AC_INIT() @@ -756,7 +756,7 @@ HTMLHELP_ENCODING="windows-1254" ;; *) -SP_OPTIONS="" +SP_OPTIONS="SP_ENCODING=XML SP_CHARSET_FIXED=YES" ;; esac
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
nlopess Thu Apr 29 11:19:26 2004 EDT Modified files: /phpdoc Makefile.in configure.in Log: enable version checking. works well on cygwin http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.148&r2=1.149&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.148 phpdoc/Makefile.in:1.149 --- phpdoc/Makefile.in:1.148Sat Apr 17 12:10:02 2004 +++ phpdoc/Makefile.in Thu Apr 29 11:19:26 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.148 2004/04/17 16:10:02 kennyt Exp $ +# $Id: Makefile.in,v 1.149 2004/04/29 15:19:26 nlopess Exp $ # all: html @@ -39,7 +39,6 @@ [EMAIL PROTECTED]@ -VERSION="@PHP_VERSION@" HTML_STYLESHEET=dsssl/html.dsl PHPWEB_STYLESHEET=dsssl/phpweb.dsl HOWTO_STYLESHEET=dsssl/howto.dsl http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.200&r2=1.201&ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.200 phpdoc/configure.in:1.201 --- phpdoc/configure.in:1.200 Sun Feb 8 07:58:13 2004 +++ phpdoc/configure.in Thu Apr 29 11:19:26 2004 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.200 2004/02/08 12:58:13 leszek Exp $ +dnl $Id: configure.in,v 1.201 2004/04/29 15:19:26 nlopess Exp $ dnl autoconf initialisation AC_INIT() @@ -67,14 +67,14 @@ else AC_MSG_CHECKING([php version]) PHPVERSION=`$PHP -q -f $srcdir/scripts/version.php` -# version check disabled for now, seems to be causing troubles on cygwin -# if test "yes" = `echo '3?"yes":"no"; ?>' | $PHP -q`; then + + if test "yes" = `echo '3?"yes":"no"; ?>' | $PHP -q`; then +AC_MSG_RESULT($PHPVERSION) + else AC_MSG_RESULT($PHPVERSION) -# else -#AC_MSG_RESULT($PHPVERSION) -#AC_MSG_ERROR([PHP version 4.0.0 or newer needed]) -#PHP=no -# fi +AC_MSG_ERROR([PHP version 4.0.0 or newer needed]) +PHP=no + fi fi AC_SUBST(PHP)
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
gobaSat 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=PATHLook for Java runtime],
+AC_ARG_WITH(xsltproc,
+[ --with-xsltproc=PATHLook 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.122Sat 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
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in install.xml /RFC manual.xml.in /en/reference/apache functions.xml /en/reference/array functions.xml /en/reference/aspell functions.xml /en/reference/bc functions.xml /en/reference/bzip2 functions.xml /en/reference/calendar functions.xml /en/reference/ccvs functions.xml /en/reference/classobj functions.xml /en/reference/com functions.xml /en/reference/cpdf functions.xml /en/reference/crack functions.xml /en/reference/ctype functions.xml /en/reference/curl functions.xml /en/reference/cybercash functions.xml /en/reference/cybermut functions.xml /en/reference/cyrus functions.xml /en/reference/datetime functions.xml /en/reference/dba functions.xml /en/reference/dbase functions.xml /en/reference/dbm functions.xml /en/reference/dbplus functions.xml /en/reference/dbx functions.xml /en/reference/dio functions.xml /en/reference/dir functions.xml /en/reference/domxml functions.xml /en/reference/dotnet functions.xml /en/reference/errorfunc functions.xml /en/reference/exec functions.xml /en/reference/fbsql functions.xml /en/reference/fdf functions.xml /en/reference/filepro functions.xml /en/reference/filesystem functions.xml /en/reference/fribidi functions.xml /en/reference/ftp functions.xml /en/reference/funchand functions.xml /en/reference/gettext functions.xml /en/reference/gmp functions.xml /en/reference/http functions.xml /en/reference/hw functions.xml /en/reference/hwapi functions.xml /en/reference/ibase functions.xml /en/reference/icap functions.xml /en/reference/iconv functions.xml /en/reference/ifx functions.xml /en/reference/iisfunc functions.xml /en/reference/image functions.xml /en/reference/imap functions.xml /en/reference/info functions.xml /en/reference/ingres-ii functions.xml /en/reference/ircg functions.xml /en/reference/java functions.xml /en/reference/ldap functions.xml /en/reference/mail functions.xml /en/reference/mailparse functions.xml /en/reference/math functions.xml /en/reference/mbstring functions.xml /en/reference/mcal functions.xml /en/reference/mcrypt functions.xml /en/reference/mcve functions.xml /en/reference/mhash functions.xml /en/reference/mime_magic functions.xml /en/reference/ming functions.xml /en/reference/misc functions.xml /en/reference/mnogosearch functions.xml /en/reference/msession functions.xml /en/reference/msql functions.xml /en/reference/mssql functions.xml /en/reference/muscat functions.xml /en/reference/mysql functions.xml /en/reference/ncurses functions.xml /en/reference/network functions.xml /en/reference/nis functions.xml /en/reference/notes functions.xml /en/reference/objaggregation functions.xml /en/reference/oci8 functions.xml /en/reference/openssl functions.xml /en/reference/oracle functions.xml /en/reference/outcontrol functions.xml /en/reference/overload functions.xml /en/reference/ovrimos functions.xml /en/reference/pcntl functions.xml /en/reference/pcre functions.xml /en/reference/pdf functions.xml /en/reference/pfpro functions.xml /en/reference/pgsql functions.xml /en/reference/posix functions.xml /en/reference/printer functions.xml /en/reference/pspell functions.xml /en/reference/qtdom functions.xml /en/reference/readline functions.xml /en/reference/recode functions.xml /en/reference/regex functions.xml /en/reference/sem functions.xml /en/reference/sesam functions.xml /en/reference/session functions.xml /en/reference/shmop functions.xml /en/reference/snmp functions.xml /en/reference/sockets functions.xml /en/reference/strings functions.xml /en/reference/swf functions.xml /en/reference/sybase functions.xml /en/reference/tokenizer functions.xml /en/reference/uodbc functions.xml /en/reference/url functions.xml /en/reference/var functions.xml /en/reference/vpopmail functions.xml /en/reference/w32api functions.xml /en/reference/wddx functions.xml /en/reference/xml functions.xml /en/reference/xmlrpc functions.xml /en/reference/xslt functions.xml /en/reference/yaz functions.xml /en/reference/zip functions.xml /en/reference/zlib functions.xml /scripts file-entities.php
hholzgraTue Jun 11 06:54:25 2002 EDT Removed files: /phpdoc/en/reference/apache functions.xml /phpdoc/en/reference/array functions.xml /phpdoc/en/reference/aspell functions.xml /phpdoc/en/reference/bc functions.xml /phpdoc/en/reference/bzip2 functions.xml /phpdoc/en/reference/calendar functions.xml /phpdoc/en/reference/ccvs functions.xml /phpdoc/en/reference/classobj functions.xml /phpdoc/en/reference/comfunctions.xml /phpdoc/en/reference/cpdf functions.xml /phpdoc/en/reference/crack functions.xml /phpdoc/en/reference/ctype functions.xml /phpdoc/en/reference/curl functions.xml /phpdoc/en/reference/cybercash functions.xml /phpdoc/en/reference/cybermut functions.xml /phpdoc/en/reference/cyrus functions.xml /phpdoc/en/reference/datetime functions.xml /phpdoc/en/reference/dbafunctions.xml /phpdoc/en/reference/dbase functions.xml /phpdoc/en/reference/dbmfunctions.xml /phpdoc/en/reference/dbplus functions.xml /phpdoc/en/reference/dbxfunctions.xml /phpdoc/en/reference/diofunctions.xml /phpdoc/en/reference/dirfunctions.xml /phpdoc/en/reference/domxml functions.xml /phpdoc/en/reference/dotnet functions.xml /phpdoc/en/reference/errorfunc functions.xml /phpdoc/en/reference/exec functions.xml /phpdoc/en/reference/fbsql functions.xml /phpdoc/en/reference/fdffunctions.xml /phpdoc/en/reference/fileprofunctions.xml /phpdoc/en/reference/filesystem functions.xml /phpdoc/en/reference/fribidifunctions.xml /phpdoc/en/reference/ftpfunctions.xml /phpdoc/en/reference/funchand functions.xml /phpdoc/en/reference/gettextfunctions.xml /phpdoc/en/reference/gmpfunctions.xml /phpdoc/en/reference/http functions.xml /phpdoc/en/reference/hw functions.xml /phpdoc/en/reference/hwapi functions.xml /phpdoc/en/reference/ibase functions.xml /phpdoc/en/reference/icap functions.xml /phpdoc/en/reference/iconv functions.xml /phpdoc/en/reference/ifxfunctions.xml /phpdoc/en/reference/iisfuncfunctions.xml /phpdoc/en/reference/image functions.xml /phpdoc/en/reference/imap functions.xml /phpdoc/en/reference/info functions.xml /phpdoc/en/reference/ingres-ii functions.xml /phpdoc/en/reference/ircg functions.xml /phpdoc/en/reference/java functions.xml /phpdoc/en/reference/ldap functions.xml /phpdoc/en/reference/mail functions.xml /phpdoc/en/reference/mailparse functions.xml /phpdoc/en/reference/math functions.xml /phpdoc/en/reference/mbstring functions.xml /phpdoc/en/reference/mcal functions.xml /phpdoc/en/reference/mcrypt functions.xml /phpdoc/en/reference/mcve functions.xml /phpdoc/en/reference/mhash functions.xml /phpdoc/en/reference/mime_magic functions.xml /phpdoc/en/reference/ming functions.xml /phpdoc/en/reference/misc functions.xml /phpdoc/en/reference/mnogosearchfunctions.xml /phpdoc/en/reference/msession functions.xml /phpdoc/en/reference/msql functions.xml /phpdoc/en/reference/mssql functions.xml /phpdoc/en/reference/muscat functions.xml /phpdoc/en/reference/mysql functions.xml /phpdoc/en/reference/ncursesfunctions.xml /phpdoc/en/reference/networkfunctions.xml /phpdoc/en/reference/nisfunctions.xml /phpdoc/en/reference/notes functions.xml /phpdoc/en/reference/objaggregation functions.xml /phpdoc/en/reference/oci8 functions.xml /phpdoc/en/reference/opensslfunctions.xml /phpdoc/en/reference/oracle functions.xml /phpdoc/en/reference/outcontrol functions.xml /phpdoc/en/reference/overload functions.xml /phpdoc/en/reference/ovrimosfunctions.xml /phpdoc/en/reference/pcntl functions.xml /phpdoc/en/reference/pcre functions.xml /phpdoc/en/reference/pdffunctions.xml /phpdoc/en/reference/pfpro functions.xml /phpdoc/en/reference/pgsql functions.xml /phpdoc/en/reference/posix functions.xml /phpdoc/en/reference/printerfunctions.xml /phpdoc/en/reference/pspell functions.xml /phpdoc/en/reference/qtdom functions.xml /phpdoc/en/reference/readline functions.xml /phpdoc/en/reference/recode functions.xml /phpdoc/en/reference/regex functions.xml /phpdoc/en/reference/semfunctions.xml /phpdoc/en/reference/sesam functions.xml /phpdoc/en/reference/sessionfunctions.xml /phpdoc/en/reference/shmop functions.xml /phpdoc/en/reference/snmp functions.xml /phpdoc/en/reference/socketsfunctions.xml /phpdoc/en/reference/stringsfunctions.xml /phpdoc/en/refe
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
jimwSat May 25 13:03:47 2002 EDT Modified files: /phpdoc Makefile.in configure.in Log: include figures in tar.bz2, tar.gz, and .zip Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.116 phpdoc/Makefile.in:1.117 --- phpdoc/Makefile.in:1.116Sun May 19 14:31:38 2002 +++ phpdoc/Makefile.in Sat May 25 13:03:46 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.116 2002/05/19 18:31:38 tom Exp $ +# $Id: Makefile.in,v 1.117 2002/05/25 17:03:46 jimw Exp $ # all: html @@ -167,13 +167,13 @@ iSilo386 @MANUAL@.html @MANUAL@.isilo.pdb @MANUAL@.zip: html/index.html - -rm -f $@ && (cd html; zip -9 -q ../$@ *.html) + -rm -f $@ && (cd html; zip -R -9 -q ../$@ *.html *.png) @MANUAL@.tar.gz: html/index.html - -rm -f $@ && (cd html; tar -cf - *.html) | gzip -9 > $@ + -rm -f $@ && (cd html; tar -cf - *.html @FIGURES@) | gzip -9 > $@ @MANUAL@.tar.bz2: html/index.html - -rm -f $@ && (cd html; tar -cf - *.html) | bzip2 -9 > $@ + -rm -f $@ && (cd html; tar -cf - *.html @FIGURES@) | bzip2 -9 > $@ howto/html/index.html: howto/howto.xml $(HOWTO_DEPS) @test -d howto/html || mkdir howto/html Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.149 phpdoc/configure.in:1.150 --- phpdoc/configure.in:1.149 Sun May 19 14:25:44 2002 +++ phpdoc/configure.in Sat May 25 13:03:46 2002 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.149 2002/05/19 18:25:44 tom Exp $ +dnl $Id: configure.in,v 1.150 2002/05/25 17:03:46 jimw Exp $ dnl autoconf initialisation AC_INIT() @@ -446,10 +446,12 @@ ZEND_FIGURES="cp -r $ZENDAPI/figures ." ZEND_FIGURES_HTML="$ZEND_FIGURES/html" ZEND_FIGURES_PHP="$ZEND_FIGURES/php" +FIGURES="figures" else ZEND_FIGURES="" ZEND_FIGURES_HTML="" ZEND_FIGURES_PHP="" +FIGURES="" fi ]) @@ -457,6 +459,7 @@ AC_SUBST(ZEND_FIGURES) AC_SUBST(ZEND_FIGURES_HTML) AC_SUBST(ZEND_FIGURES_PHP) +AC_SUBST(FIGURES) dnl }}}
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in/scripts missing-entities.sh.in
> > make test still doesn't work for me: > > I just fixed this in cvs; update your sources and try again. Thanks. It's ok now. slawek-
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in/scripts missing-entities.sh.in
On Fri, 2002-02-01 at 13:33, Slawomir Pucia wrote: > make test still doesn't work for me: I just fixed this in cvs; update your sources and try again. Torben > make clean > autoconf > ./configure > > $ cat entities/missing-ids.xml > > > $ make test > touch .manual.xml > CONFIG_FILES=manual.xml CONFIG_HEADERS= ./config.status > creating manual.xml > /usr/bin/nsgmls -i lang-en -D . -s ./dtds/dbxml-3.1.7/phpdocxml.dcl > manual.xml > /usr/bin/nsgmls:entities/missing-ids.xml:1:44:E: entity end not allowed in > processing instruction > make: *** [test] Error 1 > > > slawek- > > > > -- Torben Wilson <[EMAIL PROTECTED]> http://www.thebuttlesschaps.com http://www.hybrid17.com http://www.inflatableeye.com +1.604.709.0506
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in /scripts missing-entities.sh.in
make test still doesn't work for me: make clean autoconf ./configure $ cat entities/missing-ids.xml $ make test touch .manual.xml CONFIG_FILES=manual.xml CONFIG_HEADERS= ./config.status creating manual.xml /usr/bin/nsgmls -i lang-en -D . -s ./dtds/dbxml-3.1.7/phpdocxml.dcl manual.xml /usr/bin/nsgmls:entities/missing-ids.xml:1:44:E: entity end not allowed in processing instruction make: *** [test] Error 1 slawek-
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in /scripts missing-entities.sh.in
hholzgraFri Feb 1 06:13:37 2002 EDT
Added files:
/phpdoc/scripts missing-entities.sh.in
Modified files:
/phpdoc Makefile.in configure.in manual.xml.in
Log:
creating fallbacks for missing entities done right now
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.109 phpdoc/Makefile.in:1.110
--- phpdoc/Makefile.in:1.109Thu Jan 31 16:27:14 2002
+++ phpdoc/Makefile.in Fri Feb 1 06:13:36 2002
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.109 2002/01/31 21:27:14 hholzgra Exp $
+# $Id: Makefile.in,v 1.110 2002/02/01 11:13:36 hholzgra Exp $
#
all: html
@@ -42,7 +42,7 @@
KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
XMLDCL=$(srcdir)/dtds/dbxml-@DOCBOOK_VERSION@/phpdocxml.dcl
-HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in zendapi entities
+HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
+dsssl/common.dsl.in zendapi
HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in howto/howto.ent
PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in zendapi
PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapi
@@ -59,9 +59,7 @@
@AUTOGENERATED_RULES@
entities: FORCE
- $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep "not defined" |
sed -e's/^.* "//g' | sort | uniq >
entities/missing-entities.ent
- $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep
non-existent | sed -e"s/^.* ID /<\/para>/g" | sort | uniq >
entities/missing-ids.xml
-
+ $(srcdir)/scripts/entities.sh
manual.xml: $(srcdir)/manual.xml.in .manual.xml
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
@@ -228,12 +226,16 @@
# test all possible errors
test: manual.xml
- if test ! -e funcindex.xml; then touch funcindex.xml; fi
+ @if test ! -e funcindex.xml; then touch funcindex.xml; fi
+ @if test ! -e entities/missing-entities.ent; then touch
+entities/missing-entities.ent; fi
+ @if test ! -e entities/missing-ids.xml; then touch entities/missing-ids.xml;
+fi
$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
# ignore missing IDs and check if the manual can be generated anyway
test_man_gen: manual.xml
- if test ! -e funcindex.xml; then touch funcindex.xml; fi
+ @if test ! -e funcindex.xml; then touch funcindex.xml; fi
+ @if test ! -e entities/missing-entities.ent; then touch
+entities/missing-entities.ent; fi
+ @if test ! -e entities/missing-ids.xml; then touch entities/missing-ids.xml;
+fi
$(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml
# }}}
@@ -248,6 +250,7 @@
rm -f *.aux *.tex *.log *.dvi *.toc *.ps *.gz
rm -f status.txt missing.txt
rm -f entities/chapters.ent
+ rm -f entities/missing*
distclean: clean
for file in `find . -name "*.in"`; do rm `dirname $$file`/`basename $$file
.in`; done
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.123 phpdoc/configure.in:1.124
--- phpdoc/configure.in:1.123 Mon Jan 28 12:10:12 2002
+++ phpdoc/configure.in Fri Feb 1 06:13:36 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.123 2002/01/28 17:10:12 phanto Exp $
+dnl $Id: configure.in,v 1.124 2002/02/01 11:13:36 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -630,7 +630,7 @@
dnl {{{ generate output files
dnl keep in one line for win32
-AC_OUTPUT(Makefile entities/version.ent dsssl/common.dsl dsssl/howto.dsl
dsssl/html.dsl dsssl/html-locale.dsl dsssl/install.dsl dsssl/print.dsl
dsssl/phpweb.dsl dsssl/quickref.dsl manual.xml xsl/html.xsl xsl/bightml.xsl
xsl/print.xsl xsl/htmlhelp.xsl)
+AC_OUTPUT(Makefile entities/version.ent dsssl/common.dsl dsssl/howto.dsl
+dsssl/html.dsl dsssl/html-locale.dsl dsssl/install.dsl dsssl/print.dsl
+dsssl/phpweb.dsl dsssl/quickref.dsl manual.xml xsl/html.xsl xsl/bightml.xsl
+xsl/print.xsl xsl/htmlhelp.xsl scripts/missing-entities.sh)
rm -f autogenerated_rules
dnl {{{ generate additional entity file for translation support
@@ -669,6 +669,11 @@
echo "" >>
entities/chapters.ent
chmod a-w entities/chapters.ent
+
+dnl check for missing IDs and ENTITYs in translation
+echo creating entities/missing-entities.ent and entities/missing-ids.xml
+chmod u+x scripts/missing-entities.sh
+scripts/missing-entities.sh
dnl }}}
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.107 phpdoc/manual.xml.in:1.108
--- phpdoc/manual.xml.in:1.107 Thu Jan 31 16:27:14 2002
+++ phpdoc/manual.xml.inFri Feb 1 06:13:36 2002
@@ -215,7 +215,7 @@
&appendices.resources;
&appendices.about;
&global.function-index;
-missing stuff&missing-ids;
+ &missing-ids;
Index: phpdoc/scripts/missing-entities.sh.in
+++ phpdoc/scripts/missing-entities.sh.in
#!/bin/sh
# generate files containing missing entities
srcdir="@srcdir@"
NSGMLS="@SP_OPTIONS@ @N
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in
hholzgraThu Jan 17 06:16:21 2002 EDT
Modified files:
/phpdoc Makefile.in configure.in manual.xml.in
Log:
final docbook4 preparation
configure.in: will now choose DTD id and version by checking for the
use of
manual.xml.in: use DTD id detected by configure instead of hardcoded
makefile.xml.in: use DTD version
make makedoc in builddir, not sourcedir
drop funcindex dependency for now, rethink
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.102 phpdoc/Makefile.in:1.103
--- phpdoc/Makefile.in:1.102Wed Jan 16 13:36:07 2002
+++ phpdoc/Makefile.in Thu Jan 17 06:16:21 2002
@@ -17,7 +17,7 @@
#
#
-# $Id: Makefile.in,v 1.102 2002/01/16 18:36:07 hholzgra Exp $
+# $Id: Makefile.in,v 1.103 2002/01/17 11:16:21 hholzgra Exp $
#
all: html
@@ -43,12 +43,12 @@
PRINT_STYLESHEET=dsssl/print.dsl
QUICKREF_STYLESHEET=dsssl/quickref.dsl
KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
-XMLDCL=$(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl
+XMLDCL=$(srcdir)/dtds/dbxml-@DOCBOOK_VERSION@/phpdocxml.dcl
-HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in funcindex zendapi
+HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
+dsssl/common.dsl.in zendapi
HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in howto/howto.ent
-PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in funcindex
zendapi
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl funcindex
zendapi
+PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in zendapi
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapi
KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile
DIST_FILES=@MANUAL@.zip @MANUAL@.tar.gz @MANUAL@.tar.bz2 \
@@ -129,8 +129,9 @@
echo '' > $@
$(JADE) $(CATALOG) -d $(KDEVELOP_TOC_STYLESHEET) -V nochunks -t sgml $(XMLDCL)
manual.xml | sed -e's/\& /\& /g' >> $@
-@srcdir@/scripts/makedoc: @srcdir@scripts/makedoc.cc
- g++ -o @srcdir@scripts/makedoc @srcdir@scripts/makedoc.cc
+scripts/makedoc: $(scriptdir)/makedoc.cc
+ mkdir -p scripts
+ g++ -o scripts/makedoc $(scriptdir)/makedoc.cc
# intermediate file for name change
.INTERMEDIATE: @MANUAL@.xml
@@ -147,8 +148,8 @@
@test -d php || mkdir php
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
-@MANUAL@.doc.pdb: @MANUAL@.txt @srcdir@/scripts/makedoc
- @srcdir@/scripts/makedoc -b @MANUAL@.txt @MANUAL@.doc.pdb @PALMDOCTITLE@
+@MANUAL@.doc.pdb: @MANUAL@.txt scripts/makedoc
+ scripts/makedoc -b @MANUAL@.txt @MANUAL@.doc.pdb @PALMDOCTITLE@
# Note: Isilo converter available only in binary from www.isilo.com
@MANUAL@.isilo.pdb: @MANUAL@.html
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.117 phpdoc/configure.in:1.118
--- phpdoc/configure.in:1.117 Tue Jan 15 06:31:46 2002
+++ phpdoc/configure.in Thu Jan 17 06:16:21 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.117 2002/01/15 11:31:46 hholzgra Exp $
+dnl $Id: configure.in,v 1.118 2002/01/17 11:16:21 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -175,8 +175,17 @@
dnlDOCBOOK_DOCTYPE="-//Davenport//DTD DocBook V3.0//EN"
dnlAC_MSG_RESULT(defaulting to $DOCBOOK_DOCTYPE)
dnl fi
-DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V1.4//EN"
+
+
+if grep -q methodsynopsis en/functions/array.xml; then
+ DOCBOOK_DOCTYPE="-//OASIS//DTD DocBook XML V4.1.2//EN"
+ DOCBOOK_VERSION="4.1.2"
+else
+ DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V3.1.7//EN"
+ DOCBOOK_VERSION="3.1.7"
+fi
AC_SUBST(DOCBOOK_DOCTYPE)
+AC_SUBST(DOCBOOK_VERSION)
dnl }}}
@@ -277,8 +286,6 @@
if test -z "$DOCBOOK_HTML" -a -z "$DOCBOOKXSL_HTML"; then
AC_MSG_ERROR(WARNING!!! NO STYLESHEETS FOUND - WON'T WORK THIS WAY)
fi
-
-
dnl {{{ check for catalog files
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.102 phpdoc/manual.xml.in:1.103
--- phpdoc/manual.xml.in:1.102 Fri Jan 11 04:51:36 2002
+++ phpdoc/manual.xml.inThu Jan 17 06:16:21 2002
@@ -1,5 +1,5 @@
-
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
hholzgraThu Jan 10 14:25:25 2002 EDT
Modified files:
/phpdoc configure.in Makefile.in
Log:
quick 'srcdir' fixes
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.111 phpdoc/configure.in:1.112
--- phpdoc/configure.in:1.111 Wed Jan 9 18:51:53 2002
+++ phpdoc/configure.in Thu Jan 10 14:25:24 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.111 2002/01/09 23:51:53 hholzgra Exp $
+dnl $Id: configure.in,v 1.112 2002/01/10 19:25:24 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -185,9 +185,8 @@
AC_MSG_RESULT(in $withval)
fi
],[
- cd dsssl
- for dir1 in ../../phpdoc-tools/dsssl \
- ../phpdoc-tools/dsssl \
+ for dir1 in $srcdir/phpdoc-tools/dsssl \
+ $srcdir/../phpdoc-tools/dsssl \
/usr/share/sgml \
/usr/local/share/sgml \
/usr/lib/sgml \
@@ -214,7 +213,6 @@
done
if test ! -z "$DOCBOOK_HTML"; then break; fi
done
- cd ..
])
if test -z "$DOCBOOK_HTML"; then
AC_MSG_RESULT(not found)
@@ -240,13 +238,12 @@
AC_MSG_RESULT(in $withval)
fi
],[
- cd xsl
-for dir in \
-/usr/share/sgml/docbkxsl \
-../../phpdoc-tools/xsl/docbook \
-../../phpdoc-tools/xsl \
-../phpdoc-tools/xsl/docbook \
-../phpdoc-tools/xsl
+ for dir in \
+$srcdir/phpdoc-tools/xsl \
+$srcdir/phpdoc-tools/xsl/docbook \
+$srcdir/../phpdoc-tools/xsl \
+$srcdir/../phpdoc-tools/xsl/docbook \
+/usr/share/sgml/docbkxsl
do
if test -f "$dir/html/docbook.xsl"; then
DOCBOOKXSL_BIGHTML=$dir/html/docbook.xsl
@@ -256,8 +253,7 @@
AC_MSG_RESULT(autodetected: $dir)
break
fi
-done
- cd ..
+ done
])
if test -z "$DOCBOOKXSL_BIGHTML"; then
AC_MSG_RESULT(not found)
@@ -325,11 +321,14 @@
if test -d "$withval" ; then
PHP_SOURCE=$withval
else
-PHP_SOURCE=../php4
+PHP_SOURCE=$srcdir/../php4
fi
],[
- PHP_SOURCE=../php4
+ PHP_SOURCE=$srcdir/../php4
])
+if test ! -d $PHP_SOURCE; then
+ PHP_SOURCE=no
+fi
AC_MSG_RESULT($PHP_SOURCE)
AC_SUBST(PHP_SOURCE)
@@ -348,8 +347,8 @@
],[
ZENDAPI="not found"
for dir in \
-./ZendAPI \
-../ZendAPI
+$srcdir/ZendAPI \
+$srcdir/../ZendAPI
do
if test -d "$dir"; then
ZENDAPI="autodetected $dir"
@@ -624,8 +623,8 @@
if test -d "$ZENDAPI"; then
echo >> entities/chapters.ent
echo "" >> entities/chapters.ent
- echo "" >>
entities/chapters.ent
- echo "" >>
entities/chapters.ent
+ echo "" >>
+entities/chapters.ent
+ echo "" >>
+entities/chapters.ent
echo >> entities/chapters.ent
echo "%zend.defs;" >> entities/chapters.ent
echo "" >> entities/chapters.ent
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.97 phpdoc/Makefile.in:1.98
--- phpdoc/Makefile.in:1.97 Tue Jan 8 17:26:34 2002
+++ phpdoc/Makefile.in Thu Jan 10 14:25:25 2002
@@ -17,7 +17,7 @@
#
#
-# $Id: Makefile.in,v 1.97 2002/01/08 22:26:34 hholzgra Exp $
+# $Id: Makefile.in,v 1.98 2002/01/10 19:25:25 hholzgra Exp $
#
all: html
@@ -45,11 +45,10 @@
KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
XMLDCL=$(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl
-HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl
dsssl/common.dsl zendapi
-HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl
dsssl/common.dsl howto/howto.ent
-PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl zendapi
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl
-QUICKREF_DEPS=dsssl/quickref.dsl Makefile
+HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
+dsssl/common.dsl.in funcindex zendapi
+HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
+dsssl/common.dsl.in howto/howto.ent
+PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in funcindex
+zendapi
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl funcindex
+zendapi
KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile
DIST_FILES=@MANUAL@.zip @MANUAL@.tar.gz @MANUAL@.tar.bz2 \
@@ -121,7 +120,7 @@
summary: ./funcsummary.txt
quickref: quickref.txt
-quickref.txt: manual.xml $(QUICKREF_DEPS)
+quickref.txt: FORCE
if test ! -e funcindex.xml; then touch funcindex.xml; fi
$(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL)
manual.xml | sed -e 's/ */ /g' | sort -f > quickref.txt
@@ -224,11 +223,11 @@
# {{{ tests
# test all possible errors
-test: manual.xml
+test: manual.xml funcindex
$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
# ignore missing IDs and check if the manual can be generated anyway
-test_man_gen: manual.xml
+test_man_gen: manual.xml funcindex
$(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml
# }}}
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in funcindex.xml funclist.txt quickref.txt
hholzgraTue Jan 8 15:27:51 2002 EDT
Modified files:
/phpdoc Makefile.in configure.in funcindex.xml funclist.txt
quickref.txt
Log:
auto-generate rules for all files generated by configure but makefile.xml
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.94 phpdoc/Makefile.in:1.95
--- phpdoc/Makefile.in:1.94 Tue Jan 8 13:45:37 2002
+++ phpdoc/Makefile.in Tue Jan 8 15:27:50 2002
@@ -17,7 +17,7 @@
#
#
-# $Id: Makefile.in,v 1.94 2002/01/08 18:45:37 hholzgra Exp $
+# $Id: Makefile.in,v 1.95 2002/01/08 20:27:50 hholzgra Exp $
#
all: html
@@ -54,17 +54,7 @@
MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES)
PDF_FILES=@MANUAL@.pdf.gz @MANUAL@.pdf.bz2 @MANUAL@.pdf.zip
-dsssl/html.dsl: $(srcdir)/dsssl/html.dsl.in ./config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-
-dsssl/print.dsl: $(srcdir)/dsssl/print.dsl.in ./config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-
-dsssl/phpweb.dsl: $(srcdir)/dsssl/phpweb.dsl.in ./config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-
-dsssl/common.dsl: $(srcdir)/dsssl/common.dsl.in ./config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+@AUTOGENERATED_RULES@
manual.xml: $(srcdir)/manual.xml.in .manual.xml
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
@@ -109,12 +99,6 @@
echo "$(PHP) -q -d short_tags=off $(srcdir)/scripts/genfuncindex.php
../quickref.txt @ENCODING@ > funcindex.xml" ;\
$(PHP) -q -d short_tags=off $(srcdir)/scripts/genfuncindex.php ../quickref.txt
@ENCODING@ > funcindex.xml ;\
fi
-
-Makefile: $(srcdir)/Makefile.in ./config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-
-configure: configure.in
- autoconf
mirror-files: $(MIRROR_TARGETS)
extra-mirror-files: $(PDF_FILES)
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.108 phpdoc/configure.in:1.109
--- phpdoc/configure.in:1.108 Mon Jan 7 17:32:13 2002
+++ phpdoc/configure.in Tue Jan 8 15:27:50 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.108 2002/01/07 22:32:13 hholzgra Exp $
+dnl $Id: configure.in,v 1.109 2002/01/08 20:27:50 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -580,6 +580,31 @@
fi
fi
fi
+
+dnl }}}
+
+dnl {{{ makefile targets for configure-generated files
+
+rm -f autogenerated_rules
+(
+for file in `find . -name "*.in"`; do
+ case "$file" in
+configure.in)
+ echo configure: configure.in
+ echo "\t"autoconf
+ echo
+ ;;
+manual.xml.in)
+ ;;
+*)
+ echo `dirname $file`/`basename $file .in`: '$(srcdir)'/$file ./config.status
+ echo "\t"CONFIG_FILES='$@' CONFIG_HEADERS= ./config.status
+ echo
+ esac
+done
+) > autogenerated_rules
+AUTOGENERATED_RULES=autogenerated_rules
+AC_SUBST_FILE(AUTOGENERATED_RULES)
dnl }}}
Index: phpdoc/funcindex.xml
diff -u phpdoc/funcindex.xml:1.7 phpdoc/funcindex.xml:1.8
--- phpdoc/funcindex.xml:1.7Sun Jan 6 10:42:24 2002
+++ phpdoc/funcindex.xmlTue Jan 8 15:27:50 2002
@@ -1167,6 +1167,7 @@
mb_detect_order
mb_encode_mimeheader
mb_encode_numericentity
+ mb_get_info
mb_http_input
mb_http_output
mb_internal_encoding
Index: phpdoc/funclist.txt
diff -u phpdoc/funclist.txt:1.16 phpdoc/funclist.txt:1.17
--- phpdoc/funclist.txt:1.16Mon Jan 7 02:58:29 2002
+++ phpdoc/funclist.txt Tue Jan 8 15:27:50 2002
@@ -13,69 +13,6 @@
bcscale
bcsqrt
bcsub
-# php4/ext/bz2/bz2.c
-bzclose
-bzcompress
-bzdecompress
-bzerrno
-bzerror
-bzerrstr
-bzflush
-bzopen
-bzread
-bzwrite
-# php4/ext/calendar/calendar.c
-cal_days_in_month
-cal_from_jd
-cal_info
-cal_to_jd
-easter_date
-easter_days
-frenchtojd
-gregoriantojd
-jddayofweek
-jdmonthname
-jdtofrench
-jdtogregorian
-jdtojewish
-jdtojulian
-jdtounix
-jewishtojd
-juliantojd
-unixtojd
-# php4/ext/ccvs/ccvs.c
-ccvs_add
-ccvs_auth
-ccvs_command
-ccvs_count
-ccvs_delete
-ccvs_done
-ccvs_init
-ccvs_lookup
-ccvs_new
-ccvs_report
-ccvs_return
-ccvs_reverse
-ccvs_sale
-ccvs_status
-ccvs_textvalue
-ccvs_void
-cv_add
-cv_auth
-cv_command
-cv_count
-cv_delete
-cv_done
-cv_init
-cv_lookup
-cv_new
-cv_report
-cv_return
-cv_reverse
-cv_sale
-cv_status
-cv_textvalue
-cv_void
# php4/ext/com/COM.c
com_addref
com_get
@@ -161,48 +98,11 @@
cpdf_stroke
cpdf_text
cpdf_translate
-# php4/ext/crack/crack.c
-crack_check
-crack_closedict
-crack_getlastmessage
-crack_opendict
-# php4/ext/ctype/ctype.c
-ctype_alnum
-ctype_alpha
-ctype_cntrl
-ctype_digit
-ctype_graph
-ctype_lower
-ctype_print
-ctype_punct
-ctype_space
-ctype_upper
-ctype_xdigit
-# php4/ext/curl/curl.c
-curl_close
-curl_errno
-curl_error
-curl_exec
-curl_getinfo
-curl_init
-curl_setopt
-curl_version
# php4/ext/cybercash/cybercash.c
cybercash_base64_decode
cybercash_base64_encode
cybercash_decr
cybercash_encr
-# php4/ext/cybermut/cybermut.c
-cybermut_creerformulairecm
-cybermut_creerreponsecm
-cybermut_testmac
-# php4/ext/cyrus/cyrus.c
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
hholzgraMon Jan 7 17:32:19 2002 EDT Modified files: /phpdoc configure.in Makefile.in Log: make relative entity pathes work for both dsssl with jade/openjade and for xsl with saxon Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.107 phpdoc/configure.in:1.108 --- phpdoc/configure.in:1.107 Mon Jan 7 17:07:23 2002 +++ phpdoc/configure.in Mon Jan 7 17:32:13 2002 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.107 2002/01/07 22:07:23 hholzgra Exp $ +dnl $Id: configure.in,v 1.108 2002/01/07 22:32:13 hholzgra Exp $ dnl autoconf initialisation AC_INIT() @@ -598,8 +598,8 @@ if test -d "$ZENDAPI"; then echo >> entities/chapters.ent echo "" >> entities/chapters.ent - echo "" >> entities/chapters.ent - echo "" >> entities/chapters.ent + echo "" >> +entities/chapters.ent + echo "" >> +entities/chapters.ent echo >> entities/chapters.ent echo "%zend.defs;" >> entities/chapters.ent echo "" >> entities/chapters.ent @@ -619,9 +619,9 @@ echo " untranslated $file (`wc -l <$file | tr -d ' '` lines)" fi DEPEND_FILES="$DEPEND_FILES $file" - echo "" >> entities/chapters.ent + echo "" >> entities/chapters.ent done -echo "" >> entities/chapters.ent +echo "" >> +entities/chapters.ent chmod a-w entities/chapters.ent Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.87 phpdoc/Makefile.in:1.88 --- phpdoc/Makefile.in:1.87 Mon Jan 7 12:36:35 2002 +++ phpdoc/Makefile.in Mon Jan 7 17:32:19 2002 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.87 2002/01/07 17:36:35 hholzgra Exp $ +# $Id: Makefile.in,v 1.88 2002/01/07 22:32:19 hholzgra Exp $ # @@ -25,8 +25,8 @@ srcdir=@srcdir@ scriptdir=@srcdir@/scripts PHP_SOURCE=@PHP_SOURCE@ -LANG=@LANG@ -JADE=@SP_OPTIONS@ @JADE@ -wno-idref +LANG=@LANG@ -D . +JADE=@SP_OPTIONS@ @JADE@ -D . -wno-idref NSGMLS=@SP_OPTIONS@ @NSGMLS@ PHP=@PHP@
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in
blame me, not only did i convert all tabs to two spaces, i also configured my .cvsrc so that 'cvs diff' won't show pure whitspace differences ... :( -- Hartmut Holzgraefe [EMAIL PROTECTED] http://www.six.de +49-711-99091-77
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
hholzgraSat Jan 5 14:41:08 2002 EDT
Modified files:
/phpdoc configure.in Makefile.in
Log:
it is now possible to specify which jade and nsgmls binaries to use
by specifying the appropriate files using the new configure options
--with-jade and --with-nsgmls
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.91 phpdoc/configure.in:1.92
--- phpdoc/configure.in:1.91Sat Jan 5 12:44:11 2002
+++ phpdoc/configure.in Sat Jan 5 14:41:07 2002
@@ -1,49 +1,134 @@
-dnl $Id: configure.in,v 1.91 2002/01/05 17:44:11 hholzgra Exp $
+dnl $Id: configure.in,v 1.92 2002/01/05 19:41:07 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
+dnl {{{ check for support programs
-dnl check for support programs
+dnl {{{ check for PHP
-dnl check for PHP
dnl use given argument, if any, else search in path
AC_ARG_WITH(php,
-[ --with-php=[PATH] Look for PHP executable needed for helper scripts],
+[ --with-php=PATH Look for PHP executable needed for helper scripts],
[
- if test $withval != "yes"; then
- AC_MSG_CHECKING([for php])
- if test -x $withval; then
- PHP=$withval
- AC_MSG_RESULT($PHP)
- else
- PHP=no
- AC_MSG_RESULT(no)
- AC_MSG_WARN([$withval: not an executable file])
- fi
- else
- AC_PATH_PROG(PHP,"php",no)
+ if test $withval != "yes"; then
+AC_MSG_CHECKING([for php])
+if test -x $withval; then
+ PHP=$withval
+ AC_MSG_RESULT($PHP)
+else
+ PHP=no
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$withval: not an executable file])
+fi
+ else
+AC_PATH_PROG(PHP,"php",no)
fi
],[
- AC_PATH_PROG(PHP,"php",no)
+ AC_PATH_PROG(PHP,"php",no)
]
)
if test $PHP = "no"; then
- AC_MSG_WARN([no PHP binary found])
+ AC_MSG_WARN([no PHP binary found])
else
- AC_MSG_CHECKING([php version])
- PHPVERSION=`$PHP -qv`
- if test "yes" == `echo '3?"yes":"no"; ?>' | $PHP -q`; then
- AC_MSG_RESULT($PHPVERSION ok)
- else
- AC_MSG_RESULT($PHPVERSION)
- AC_MSG_WARN([PHP version 4.0.0 or newer needed])
- PHP=no
- fi
+ AC_MSG_CHECKING([php version])
+ PHPVERSION=`$PHP -qv`
+ if test "yes" == `echo '3?"yes":"no"; ?>' | $PHP -q`; then
+AC_MSG_RESULT($PHPVERSION ok)
+ else
+AC_MSG_RESULT($PHPVERSION)
+AC_MSG_WARN([PHP version 4.0.0 or newer needed])
+PHP=no
+ fi
fi
AC_SUBST(PHP)
+dnl }}}
+
+dnl {{{ check for the OpenJade DSSSL parser
+
+dnl use given argument, if any, else search in path
+
+AC_ARG_WITH(jade,
+[ --with-jade=PATHLook for jade or openjade executable],[
+ if test $withval != "yes"; then
+AC_MSG_CHECKING([for jade])
+if test -x $withval; then
+ JADE=$withval
+ AC_MSG_RESULT($JADE)
+else
+ JADE=no
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$withval: not an executable file])
+fi
+ else
+if test -e ../phpdoc-tools/jade/jade.exe ; then
+ AC_MSG_CHECKING([for jade])
+ JADE=../phpdoc-tools/jade/jade.exe
+ AC_MSG_RESULT($JADE)
+else
+ AC_PATH_PROG(JADE,"openjade",no)
+ if test $JADE = "no"; then
+AC_PATH_PROG(JADE,"jade",no)
+ fi
+fi
+ fi
+],[
+ if test -e ../phpdoc-tools/jade/jade.exe ; then
+AC_MSG_CHECKING([for jade])
+JADE=../phpdoc-tools/jade/jade.exe
+AC_MSG_RESULT($JADE)
+ else
+AC_PATH_PROG(JADE,"openjade",no)
+if test $JADE = "no"; then
+ AC_PATH_PROG(JADE,"jade",no)
+fi
+ fi
+]
+)
+AC_SUBST(JADE)
+
+dnl }}}
+
+dnl {{{ check for nsgmls (for win32 plug&pray)
+
+AC_ARG_WITH(nsgmls,
+[ --with-nsgmls=PATH Look for nsgmls executable],[
+ if test $withval != "yes"; then
+AC_MSG_CHECKING([for nsgmls])
+if test -x $withval; then
+ NSGMLS=$withval
+ AC_MSG_RESULT($NSGMLS)
+else
+ NSGMLS=no
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$withval: not an executable file])
+fi
+ else
+if test -e ../phpdoc-tools/jade/nsgmls.exe ; then
+ AC_MSG_CHECKING([for nsgmls])
+ NSGMLS=../phpdoc-tools/jade/nsgmls.exe
+ AC_MSG_RESULT($NSGMLS)
+else
+ AC_PATH_PROG(NSGMLS,"nsgmls",no)
+fi
+ fi
+],[
+if test -e ../phpdoc-tools/jade/nsgmls.exe ; then
+ AC_MSG_CHECKING([for nsgmls])
+ NSGMLS=../phpdoc-tools/jade/nsgmls.exe
+ AC_MSG_RESULT($NSGMLS)
+else
+ AC_PATH_PROG(NSGMLS,"nsgmls",no)
+fi
+]
+)
+AC_SUBST(NSGMLS)
+
+dnl }}}
+
+dnl }}}
@@ -52,20 +137,20 @@
dnl AC_MSG_CHECKING(for DocBook doctype)
dnl check_catalog_files() {
dnlfor catalog in $@; do
-dnl DBDT=`grep -E '^PUBLIC.*"docbook.dtd".*$' $catalog 2>/dev/null | cut -d'"'
-f 2 `
-dnl if test -n "$DBDT" ; then
-dnl DOCBOOK_DOCTYPE=$DBDT
-dnl return 1
-dnl fi
-dnl MORECATS=`grep -i '^catalog' $catalog 2>/dev/nu
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in
phanto Mon Nov 12 18:02:59 2001 EDT Modified files: /phpdoc configure.in Makefile.in manual.xml.in Log: ZendAPI manual integration Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.79 phpdoc/configure.in:1.80 --- phpdoc/configure.in:1.79Tue Oct 23 07:18:55 2001 +++ phpdoc/configure.in Mon Nov 12 18:02:58 2001 @@ -1,4 +1,6 @@ -dnl $Id: configure.in,v 1.79 2001/10/23 11:18:55 leszek Exp $ + + +dnl $Id: configure.in,v 1.80 2001/11/12 23:02:58 phanto Exp $ AC_INIT(global.ent) @@ -144,6 +146,33 @@ PHP_BUILD_DATE=`date` AC_SUBST(PHP_BUILD_DATE) +AC_MSG_CHECKING(for ZendAPI) +AC_ARG_WITH(zendapi, +[ --with-zendapi=[DIR] Look for ZendAPI documentation in the specified +directory], +[ +if test -d "$withval" ; then + ZENDAPI=$withval +fi +],[ +for dir in \ + ./ZendAPI \ + ../ZendAPI +do + if test -d "$dir"; then + ZENDAPI=$dir +AC_MSG_RESULT(autodetected: $dir) +break + fi +done + +if test -d "$ZENDAPI"; then + ZEND_FIGURES="cp -r $ZENDAPI/figures ." +else + ZEND_FIGURES="" +fi +]) +AC_SUBST(ZEND_FIGURES) + AC_MSG_CHECKING(for language) AC_ARG_WITH(lang, [ --with-lang=LANGChoose a language to work with], @@ -439,6 +468,19 @@ DEPEND_FILES="" rm -f chapters.ent echo "" > chapters.ent +if test -d "$ZENDAPI"; then + echo >> chapters.ent + echo "" >> chapters.ent + echo "" >> +chapters.ent + echo "" >> +chapters.ent + echo >> chapters.ent + echo "%zend.defs;" >> chapters.ent + echo "" >> chapters.ent + echo >> chapters.ent +else + echo "" >> chapters.ent + echo "" >> chapters.ent +fi for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort` do name=`echo $file | sed -e"s/\//./g" -e"s/.xml$//g" -e "s/_/-/g"` @@ -451,6 +493,6 @@ fi DEPEND_FILES="$DEPEND_FILES $file" echo "" >> chapters.ent -done +done chmod a-w chapters.ent Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.76 phpdoc/Makefile.in:1.77 --- phpdoc/Makefile.in:1.76 Sat Nov 10 16:18:52 2001 +++ phpdoc/Makefile.in Mon Nov 12 18:02:58 2001 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.76 2001/11/10 21:18:52 jimw Exp $ +# $Id: Makefile.in,v 1.77 2001/11/12 23:02:58 phanto Exp $ # VPATH=@srcdir@ @@ -37,9 +37,9 @@ QUICKREF_STYLESHEET=quickref.dsl KDEVELOP_TOC_STYLESHEET=kdevelop_toc.dsl -HTML_DEPS=$(HTML_STYLESHEET) html-common.dsl html-locale.dsl common.dsl +HTML_DEPS=$(HTML_STYLESHEET) html-common.dsl html-locale.dsl common.dsl zendapi HOWTO_DEPS=$(HOWTO_STYLESHEET) html-common.dsl html-locale.dsl common.dsl howto/howto.ent -PRINT_DEPS=$(PRINT_STYLESHEET) common.dsl +PRINT_DEPS=$(PRINT_STYLESHEET) common.dsl zendapi PHPWEB_DEPS=$(PHPWEB_STYLESHEET) html-common.dsl common.dsl QUICKREF_DEPS=quickref.dsl Makefile KDEVELOP_TOC_DEPS=kdevelop_toc.dsl Makefile @@ -71,6 +71,9 @@ .manual.xml: $(DEPEND_FILES) global.ent touch .manual.xml +zendapi: + @ZEND_FIGURES@ + html: html/index.html bightml: @MANUAL@.html phpweb: php/index.php @@ -223,7 +226,7 @@ $(NSGMLS) -wno-idref -i lang-$(LANG) -s $(srcdir)/phpdocxml.dcl $< clean: - rm -rf html php howto/html + rm -rf html php fancy figures howto/html rm -f @MANUAL@.txt [a-z]*.html @MANUAL@.rtf manual.info rm -f @MANUAL@.zip @MANUAL@.tar.gz .manual.xml rm -f manual_*.pdb makedoc *.manifest Index: phpdoc/manual.xml.in diff -u phpdoc/manual.xml.in:1.85 phpdoc/manual.xml.in:1.86 --- phpdoc/manual.xml.in:1.85 Sun Nov 11 05:20:10 2001 +++ phpdoc/manual.xml.inMon Nov 12 18:02:58 2001 @@ -193,6 +193,8 @@ &faq.misc; + &zend.api; + &Appendixes; &appendices.migration;
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
jah Sun Aug 26 08:42:35 2001 EDT Modified files: /phpdoc Makefile.in configure.in Log: Starting the move to the naming convention suggested by Goba. Now only for PDF version, let's wait for possible reactions before continuing. Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.62 phpdoc/Makefile.in:1.63 --- phpdoc/Makefile.in:1.62 Sun Jul 8 00:03:56 2001 +++ phpdoc/Makefile.in Sun Aug 26 08:42:35 2001 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.62 2001/07/08 04:03:56 jimw Exp $ +# $Id: Makefile.in,v 1.63 2001/08/26 12:42:35 jah Exp $ # VPATH=@srcdir@ @@ -75,7 +75,7 @@ rtf: manual.rtf dvi: manual.dvi ps: manual.ps -pdf: manual.pdf +pdf: @MANUAL@.pdf howto: howto.html FORCE: @@ -129,7 +129,7 @@ manual.txt.gz: manual.txt gzip -9 -c $< > $@ -manual.pdf: manual.tex +@MANUAL@.pdf: manual.tex # a hack around bugs in jade/jadetex... mv manual.tex manual.tex.tmp sed -e '/HeadingText/,/endHeadPar/ s/_/\\137/g' manual.tex.tmp > manual.tex @@ -138,7 +138,7 @@ -jadetex $< -jadetex $< -jadetex $< - dvipdfm -p @PDF_PAPER_TYPE@ manual.dvi + dvipdfm -o @MANUAL@.pdf -p @PDF_PAPER_TYPE@ manual.dvi html/index.html: manual.xml $(HTML_DEPS) @test -d html || mkdir html Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.74 phpdoc/configure.in:1.75 --- phpdoc/configure.in:1.74Mon Aug 13 11:11:06 2001 +++ phpdoc/configure.in Sun Aug 26 08:42:35 2001 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.74 2001/08/13 15:11:06 jkj Exp $ +dnl $Id: configure.in,v 1.75 2001/08/26 12:42:35 jah Exp $ AC_INIT(global.ent) @@ -191,6 +191,9 @@ ]) AC_SUBST(LANG) AC_SUBST(LANGDIR) + +MANUAL="php_manual_$LANG" +AC_SUBST(MANUAL) dnl localize paper size by language dnl (instead of using system-dependant default)
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in
jmcastagnetto Fri Feb 9 20:46:14 2001 EDT Modified files: /phpdoc Makefile.in configure.in Log: Added rules in config file, so the PalmPilot DOC version gets the title in the correct language. Could not input the Japanese title though. Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.57 phpdoc/Makefile.in:1.58 --- phpdoc/Makefile.in:1.57 Tue Feb 6 15:47:24 2001 +++ phpdoc/Makefile.in Fri Feb 9 20:46:14 2001 @@ -26,7 +26,7 @@ # +--+ # -# $Id: Makefile.in,v 1.57 2001/02/06 23:47:24 jimw Exp $ +# $Id: Makefile.in,v 1.58 2001/02/10 04:46:14 jmcastagnetto Exp $ # VPATH=@srcdir@ @@ -50,6 +50,8 @@ PHPWEB_DEPS=$(PHPWEB_STYLESHEET) html-common.dsl common.dsl QUICKREF_DEPS=quickref.dsl Makefile +PALMDOCTITLE=@PALMDOCTITLE@ + all: html DIST_FILES=manual.zip manual.tar.gz bigmanual.html.gz \ @@ -150,10 +152,10 @@ manual.txt: bigmanual.html lynx -nolist -dump file:`pwd`/bigmanual.html > manual.txt -# really should figure out title based on language manual_doc.pdb: manual.txt makedoc - ./makedoc -b manual.txt manual_doc.pdb 'PHP Manual' + ./makedoc -b manual.txt manual_doc.pdb $(PALMDOCTITLE) +# Note: Isilo converter available only in binary from www.isilo.com manual_isilo.pdb: bigmanual.html iSilo386 bigmanual.html manual_isilo.pdb Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.58 phpdoc/configure.in:1.59 --- phpdoc/configure.in:1.58Thu Feb 8 05:49:55 2001 +++ phpdoc/configure.in Fri Feb 9 20:46:14 2001 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.58 2001/02/08 13:49:55 jkj Exp $ +dnl $Id: configure.in,v 1.59 2001/02/10 04:46:14 jmcastagnetto Exp $ AC_INIT(global.ent) @@ -236,6 +236,19 @@ *) ENCODING="ISO-8859-1";; esac AC_SUBST(ENCODING) + +dnl localize the PalmPilot DOC title +case "$LANG" in + de) PALMDOCTITLE="'PHP Handbuch'";; + es) PALMDOCTITLE="'Manual de PHP'";; + fr) PALMDOCTITLE="'Manuel PHP'";; + hu) PALMDOCTITLE="'PHP Kézikönyv'";; + it) PALMDOCTITLE="'Manuale PHP'";; + nl) PALMDOCTITLE="'PHP Handleiding'";; + pt_BR) PALMDOCTITLE="'Manual do PHP'";; + *) PALMDOCTITLE="'PHP Manual'";; +esac +AC_SUBST(PALMDOCTITLE) dnl look for the OpenJade DSSSL parser AC_PATH_PROG(OPENJADECHK, "openjade", no)
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in
In article <[EMAIL PROTECTED]>, [EMAIL PROTECTED] wrote: > On Thu, 11 Jan 2001, Jim Winstead wrote: >> jimw Wed Jan 10 20:15:08 2001 EDT >> >> Modified files: >> /phpdoc Makefile.in configure.in manual.xml.in >> Log: clean up building from seperate directory >> >> Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.44 >> phpdoc/configure.in:1.45 >> --- phpdoc/configure.in:1.44 Fri Jan 5 17:34:24 2001 >> +++ phpdoc/configure.in Wed Jan 10 20:15:08 2001 >> @@ -1,4 +1,4 @@ >> -dnl $Id: configure.in,v 1.44 2001/01/06 01:34:24 hirokawa Exp $ >> +dnl $Id: configure.in,v 1.45 2001/01/11 04:15:08 jimw Exp $ >> >> AC_INIT(global.ent) >> >> @@ -57,7 +57,7 @@ >> /usr/local/lib/sgml/stylesheets/nwalsh-modular \ >> /usr/local/lib/sgml/docbook \ >> /usr/local/share/sgml/docbook/dsssl/modular ; do >> -if test -d "$dir"; then >> +if test -d "$srcdir/$dir"; then >> DOCBOOK_HTML="$dir/html/docbook.dsl" >> DOCBOOK_PRINT="$dir/print/docbook.dsl" > > This change actually breaks everything... whoops, yeah. guess i got a little carried away there. sorry. jim
Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in
On Thu, 11 Jan 2001, Jim Winstead wrote: > jimw Wed Jan 10 20:15:08 2001 EDT > > Modified files: > /phpdoc Makefile.in configure.in manual.xml.in > Log: > clean up building from seperate directory > > Index: phpdoc/configure.in > diff -u phpdoc/configure.in:1.44 phpdoc/configure.in:1.45 > --- phpdoc/configure.in:1.44 Fri Jan 5 17:34:24 2001 > +++ phpdoc/configure.in Wed Jan 10 20:15:08 2001 > @@ -1,4 +1,4 @@ > -dnl $Id: configure.in,v 1.44 2001/01/06 01:34:24 hirokawa Exp $ > +dnl $Id: configure.in,v 1.45 2001/01/11 04:15:08 jimw Exp $ > > AC_INIT(global.ent) > > @@ -57,7 +57,7 @@ > /usr/local/lib/sgml/stylesheets/nwalsh-modular \ > /usr/local/lib/sgml/docbook \ > /usr/local/share/sgml/docbook/dsssl/modular ; do > -if test -d "$dir"; then > +if test -d "$srcdir/$dir"; then > DOCBOOK_HTML="$dir/html/docbook.dsl" > DOCBOOK_PRINT="$dir/print/docbook.dsl" This change actually breaks everything... -- Jouni
[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in
jimwWed Jan 10 20:15:08 2001 EDT Modified files: /phpdoc Makefile.in configure.in manual.xml.in Log: clean up building from seperate directory Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.47 phpdoc/Makefile.in:1.48 --- phpdoc/Makefile.in:1.47 Fri Dec 15 00:58:52 2000 +++ phpdoc/Makefile.in Wed Jan 10 20:15:08 2001 @@ -26,7 +26,7 @@ # +--+ # -# $Id: Makefile.in,v 1.47 2000/12/15 08:58:52 hholzgra Exp $ +# $Id: Makefile.in,v 1.48 2001/01/11 04:15:08 jimw Exp $ # VPATH=@srcdir@ @@ -58,19 +58,19 @@ manual.prc manual.txt.gz MIRROR_TARGETS=php/manual.php $(DIST_FILES) html/manual.html -html.dsl: html.dsl.in ./config.status +html.dsl: $(srcdir)/html.dsl.in ./config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -print.dsl: print.dsl.in ./config.status +print.dsl: $(srcdir)/print.dsl.in ./config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -phpweb.dsl: phpweb.dsl.in ./config.status +phpweb.dsl: $(srcdir)/phpweb.dsl.in ./config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -common.dsl: common.dsl.in ./config.status +common.dsl: $(srcdir)/common.dsl.in ./config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -manual.xml: manual.xml.in .manual.xml +manual.xml: $(srcdir)/manual.xml.in .manual.xml CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status .manual.xml: $(DEPEND_FILES) global.ent @@ -112,20 +112,20 @@ tar -cvzf $@ bigmanual.html html/*.html manual.rtf manual.txt status: checkdoc ./funclist.txt - $(srcdir)/checkdoc -s > $(srcdir)/status.txt - $(srcdir)/checkdoc -m > $(srcdir)/missing.txt + ./checkdoc -s > status.txt + ./checkdoc -m > missing.txt summary: ./funcsummary.txt quickref: quickref.txt -quickref.txt: $(srcdir)/manual.xml $(QUICKREF_DEPS) - $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml | sed -e 's/ */ /g' | sort -f > quickref.txt +quickref.txt: manual.xml $(QUICKREF_DEPS) + $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml +$(srcdir)/phpdocxml.dcl manual.xml | sed -e 's/ */ /g' | sort -f > quickref.txt -makedoc: makedoc.cc - g++ -o makedoc makedoc.cc +makedoc: $(srcdir)/makedoc.cc + g++ -o makedoc $(srcdir)/makedoc.cc -bigmanual.html: $(srcdir)/manual.xml $(HTML_DEPS) - $(JADE) $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml $(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml > $@ +bigmanual.html: manual.xml $(HTML_DEPS) + $(JADE) $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml +$(srcdir)/phpdocxml.dcl manual.xml > $@ bigmanual.html.gz: bigmanual.html gzip -c $< > $@ @@ -136,17 +136,17 @@ manual.txt.gz: manual.txt gzip -c $< > $@ -html/manual.html: $(srcdir)/manual.xml $(HTML_DEPS) +html/manual.html: manual.xml $(HTML_DEPS) @test -d html || mkdir html - $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml + $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml +$(srcdir)/phpdocxml.dcl manual.xml -php/index.php: $(srcdir)/manual.xml $(PHPWEB_DEPS) +php/index.php: manual.xml $(PHPWEB_DEPS) @test -d php || mkdir php - -$(JADE) $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml + -$(JADE) $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml +$(srcdir)/phpdocxml.dcl manual.xml -php/manual.php: $(srcdir)/manual.xml $(PHPWEB_DEPS) +php/manual.php: manual.xml $(PHPWEB_DEPS) @test -d php || mkdir php - -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml $(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml + -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml +$(srcdir)/phpdocxml.dcl manual.xml manual.txt: bigmanual.html lynx -nolist -dump file:`pwd`/bigmanual.html > manual.txt @@ -154,10 +154,10 @@ manual.prc: manual.txt makedoc ./makedoc -b manual.txt manual.prc 'PHP Manual' -manual.zip: $(srcdir)/html/manual.html +manual.zip: html/manual.html -rm -f $@ && (cd html; zip -9 -q ../$@ *.html) -manual.tar.gz: $(srcdir)/html/manual.html +manual.tar.gz: html/manual.html -rm -f $@ && (cd html; tar -cf - *.html) | gzip > manual.tar.gz howto.html: $(srcdir)/howto.xml $(HOWTO_DEPS) global.ent Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.44 phpdoc/configure.in:1.45 --- phpdoc/configure.in:1.44Fri Jan 5 17:34:24 2001 +++ phpdoc/configure.in Wed Jan 10 20:15:08 2001 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.44 2001/01/06 01:34:24 hirokawa Exp $ +dnl $Id: configure.in,v 1.45 2001/01/11 04:15:08 jimw Exp $ AC_INIT(global.ent) @@ -57,7 +57,7 @@ /usr/local/lib/sgml/stylesheets/nwalsh-modular \ /usr/local/lib/sg
