[PHP-DOC] cvs: phpdoc / Makefile.in /docbook/docbook-xsl/common stripns.xsl /phpbook/phpbook-xsl param_html.xsl.in
bjori Tue Jul 31 12:53:30 2007 UTC
Modified files:
/phpdoc Makefile.in
/phpdoc/docbook/docbook-xsl/common stripns.xsl
/phpdoc/phpbook/phpbook-xsl param_html.xsl.in
Log:
Suppress "stripping namespace" and other debug messages
# Use --enable-verbose-xsl to enable them
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.200&r2=1.201&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.200 phpdoc/Makefile.in:1.201
--- phpdoc/Makefile.in:1.200Thu Jul 26 15:24:39 2007
+++ phpdoc/Makefile.in Tue Jul 31 12:53:29 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.200 2007/07/26 15:24:39 nlopess Exp $
+# $Id: Makefile.in,v 1.201 2007/07/31 12:53:29 bjori Exp $
#
all: html
@@ -38,6 +38,9 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+# Suppress "stripping namespace" messages
[EMAIL PROTECTED]@
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -131,7 +134,7 @@
$(MANUAL_STRIPPED): $(MANUAL_COMPLETE)
@echo -n "Stripping it..."
- @${XSLTPROC} -o $(MANUAL_STRIPPED)
docbook/docbook-xsl/common/stripns.xsl $(MANUAL_COMPLETE)
+ @${XSLTPROC} --param debug.silent $(DEBUG_SILENT) -o $(MANUAL_STRIPPED)
docbook/docbook-xsl/common/stripns.xsl $(MANUAL_COMPLETE)
@echo " done"
$(MANUAL_COMPLETE): FORCE entities/global.ent
http://cvs.php.net/viewvc.cgi/phpdoc/docbook/docbook-xsl/common/stripns.xsl?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/docbook/docbook-xsl/common/stripns.xsl
diff -u phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.2
phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.3
--- phpdoc/docbook/docbook-xsl/common/stripns.xsl:1.2 Tue Jan 30 18:12:37 2007
+++ phpdoc/docbook/docbook-xsl/common/stripns.xsl Tue Jul 31 12:53:30 2007
@@ -9,7 +9,7 @@
version='1.0'>
http://www.w3.org/1999/XSL/Transform";
@@ -25,5 +25,6 @@
@XSL_PARAM_QUIET@
+@XSL_PARAM_QUIET@
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Thu Jul 26 15:24:40 2007 UTC Modified files: /phpdoc Makefile.in Log: let's use html_xsl when building the regular chm files http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.199&r2=1.200&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.199 phpdoc/Makefile.in:1.200 --- phpdoc/Makefile.in:1.199Thu Jul 12 15:12:36 2007 +++ phpdoc/Makefile.in Thu Jul 26 15:24:39 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.199 2007/07/12 15:12:36 rquadling Exp $ +# $Id: Makefile.in,v 1.200 2007/07/26 15:24:39 nlopess Exp $ # all: html @@ -286,7 +286,7 @@ install.html: install.xml $(HTML_DEPS) $(JADE) $(CATALOG) -V nochunks -d $(PHPDSSSL)/install.dsl -t sgml $(XMLDCL) install.xml > $@ -chm: html FORCE +chm: html_xsl FORCE chm/make_chm.bat $(LANG) # File endings we are going to define general rules for:
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Wed Jul 4 17:13:18 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Copy&paste errors
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.197&r2=1.198&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.197 phpdoc/Makefile.in:1.198
--- phpdoc/Makefile.in:1.197Tue Jul 3 02:02:55 2007
+++ phpdoc/Makefile.in Wed Jul 4 17:13:18 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.197 2007/07/03 02:02:55 bjori Exp $
+# $Id: Makefile.in,v 1.198 2007/07/04 17:13:18 bjori Exp $
#
all: html
@@ -89,7 +89,7 @@
entities: FORCE
$(PHP) -c $(scriptdir) -q $(scriptdir)/entities.php
-manual.xml: $(srcdir)/manual.xml.in $(MANUAL_COMPLETE)
+manual.xml: $(srcdir)/manual.xml.in
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
images:
@@ -345,18 +345,18 @@
# {{{ tests
# test all possible errors
-test: $(MANUAL_STRIPPED)
+test: manual.xml
@if test ! -f funcindex.xml; then touch funcindex.xml; fi
@if test ! -f entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
@if test ! -f entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
- $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) $(MANUAL_STRIPPED)
+ $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
# ignore missing IDs and check if the manual can be generated anyway
-test_man_gen: $(MANUAL_STRIPPED)
+test_man_gen: manual.xml
@if test ! -f funcindex.xml; then touch funcindex.xml; fi
@if test ! -f entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
@if test ! -f entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
- $(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) $(MANUAL_STRIPPED)
+ $(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml
test_xml: $(MANUAL_COMPLETE)
@if test ! -f funcindex.xml; then touch funcindex.xml; fi
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Tue Jul 3 02:02:55 2007 UTC Modified files: /phpdoc Makefile.in Log: Fix typo and add the stripped manual to the cleaner http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.196&r2=1.197&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.196 phpdoc/Makefile.in:1.197 --- phpdoc/Makefile.in:1.196Tue Jul 3 00:33:39 2007 +++ phpdoc/Makefile.in Tue Jul 3 02:02:55 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.196 2007/07/03 00:33:39 bjori Exp $ +# $Id: Makefile.in,v 1.197 2007/07/03 02:02:55 bjori Exp $ # all: html @@ -380,7 +380,7 @@ clean: rm -rf html php fancy howto/html howto/php htmlhelp/html rm -f @[EMAIL PROTECTED] [a-z]*.html @[EMAIL PROTECTED] manual.info - rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] .$(MANUAL_COMPLETE) + rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] $(MANUAL_COMPLETE) $(MANUAL_STRIPPED) rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest rm -f *.aux *.tex *.log *.dvi *.toc *.ps *.gz rm -f status.txt missing.txt infiles.cache
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Tue Jul 3 00:33:39 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
- Workaround annoying limitations in xmllint
- Workaround memory issues in xmllint and xsltproc
- Simplify
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.195&r2=1.196&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.195 phpdoc/Makefile.in:1.196
--- phpdoc/Makefile.in:1.195Sat Jun 30 15:12:32 2007
+++ phpdoc/Makefile.in Tue Jul 3 00:33:39 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.195 2007/06/30 15:12:32 bjori Exp $
+# $Id: Makefile.in,v 1.196 2007/07/03 00:33:39 bjori Exp $
#
all: html
@@ -35,12 +35,15 @@
[EMAIL PROTECTED]@ @JADE@ -D . -wno-idref
[EMAIL PROTECTED]@ @NSGMLS@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -V
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+MANUAL_STRIPPED=stripped.xml
+MANUAL_COMPLETE=.manual.xml
+
PHPBOOK=phpbook
PHPDSSSL=$(PHPBOOK)/phpbook-dsssl
PHPXML=$(PHPBOOK)/phpbook-xml
@@ -61,11 +64,11 @@
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
+BIGHTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in $(MANUAL_STRIPPED)
images
+HTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in $(MANUAL_STRIPPED)
images_html
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 images
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/common.dsl images_php
+PRINT_DEPS=$(PRINT_STYLESHEET) $(PHPDSSSL)/common.dsl.in
$(PHPDSSSL)/print.dsl.in $(MANUAL_STRIPPED) images
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/common.dsl $(MANUAL_STRIPPED) images_php
KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile
[EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED]
@@ -86,12 +89,9 @@
entities: FORCE
$(PHP) -c $(scriptdir) -q $(scriptdir)/entities.php
-manual.xml: $(srcdir)/manual.xml.in .manual.xml
+manual.xml: $(srcdir)/manual.xml.in $(MANUAL_COMPLETE)
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-.manual.xml: $(DEPEND_FILES) entities/global.ent
- -$(XMLLINT) --nsclean --xinclude --noent --output .manual.xml manual.xml
-
images:
for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file $$sect.$$name; fi; done; done;
@@ -127,9 +127,17 @@
revcheck: revcheck.html
FORCE:
+ [EMAIL PROTECTED] -f $(MANUAL_COMPLETE) $(MANUAL_STRIPPED)
-stripns:
- ${XSLTPROC} -o stripped.xml docbook/docbook-xsl/common/stripns.xsl
.manual.xml
+$(MANUAL_STRIPPED): $(MANUAL_COMPLETE)
+ @echo -n "Stripping it..."
+ @${XSLTPROC} -o $(MANUAL_STRIPPED)
docbook/docbook-xsl/common/stripns.xsl $(MANUAL_COMPLETE)
+ @echo " done"
+
+$(MANUAL_COMPLETE): FORCE entities/global.ent
+ @echo -n "Generating the manual..."
+ @$(XMLLINT) --nsclean --xinclude --noent --output $(MANUAL_COMPLETE)
manual.xml
+ @echo " done"
funclist.txt: FORCE
@if test "$(PHP_SOURCE)" = "no"; then \
@@ -154,14 +162,14 @@
revcheck.html: FORCE
PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php
$(LANGDIR) > revcheck.html
-funcindex.xml: FORCE
+funcindex.xml: FORCE $(MANUAL_COMPLETE)
@if test "$(PHP)" = "no"; then \
echo "WARNING: recreating the function index needs php" ;\
echo " which was not found by configure" ;\
echo " reusing old file" ;\
touch funcindex.xml ;\
else \
- $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\
+ $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET)
$(MANUAL_COMPLETE) ;\
echo "$(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt >
funcindex.xml" ;\
$(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt >
funcindex.xml ;\
rm -f quickref-temp.txt ;\
@@ -185,12 +193,12 @@
quickref: quickref.txt
quickref.txt: FORCE
@if test ! -f funcindex.xml; then touch funcindex.xml; fi
- $(XSLTPROC) -o quickref.txt $(QUICKREF_XSL_SHEET) manual.xml
+ $(XSLTPROC) -o quickref.txt $(QUICKREF_XSL_SHEET) $(MANUAL_COMPLETE)
kdevelop_toc: php.toc
-php.toc: manual.xml $(KDEVELOP_TOC_DEPS)
+php.toc: $(MANUAL_COMPLETE) $(KDEVELOP_TOC_DEPS)
echo '' > $@
- $(JADE) $(CATALOG) -d $(KDEVELOP_TOC_STYLESHEET)
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Sat Jun 30 15:12:32 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Strip namespaces when doing dsssl html and oldschool chm_xsl builds
# This is (hopefully) just a temporary hack to make Derick happy
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.194&r2=1.195&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.194 phpdoc/Makefile.in:1.195
--- phpdoc/Makefile.in:1.194Sat Jun 23 16:13:28 2007
+++ phpdoc/Makefile.in Sat Jun 30 15:12:32 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.194 2007/06/23 16:13:28 bjori Exp $
+# $Id: Makefile.in,v 1.195 2007/06/30 15:12:32 bjori Exp $
#
all: html
@@ -128,6 +128,9 @@
FORCE:
+stripns:
+ ${XSLTPROC} -o stripped.xml docbook/docbook-xsl/common/stripns.xsl
.manual.xml
+
funclist.txt: FORCE
@if test "$(PHP_SOURCE)" = "no"; then \
echo "WARNING: recreating the function list needs php sources" ;\
@@ -201,10 +204,10 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
-html/index.html: manual.xml $(HTML_DEPS)
+html/index.html: manual.xml $(HTML_DEPS) stripns
for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file html/figures/$$sect.$$name; fi; done; done;
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
- $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
+ $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) stripped.xml
$(PHP) -q $(scriptdir)/html_syntax.php html dsssl html/
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(HACK_RTL_LANGS_PAGES)
@@ -227,8 +230,8 @@
rm -rf ./howto/html && mkdir ./howto/html
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
-chm_xsl: manual.xml images_htmlhelp
- ${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
+chm_xsl: manual.xml images_htmlhelp stripns
+ ${XSLTPROC} $(CHM_XSL_SHEET) stripped.xml
phpweb_xsl: manual.xml images_php
${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
[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 /scripts html_syntax.php
colder Tue Feb 20 21:17:39 2007 UTC
Modified files:
/phpdoc Makefile.in
/phpdoc/scripts html_syntax.php
Log:
Fix #40564 (Entities decoding required for dsssl builds)
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.191&r2=1.192&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.191 phpdoc/Makefile.in:1.192
--- phpdoc/Makefile.in:1.191Mon Feb 19 15:40:59 2007
+++ phpdoc/Makefile.in Tue Feb 20 21:17:39 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.191 2007/02/19 15:40:59 rquadling Exp $
+# $Id: Makefile.in,v 1.192 2007/02/20 21:17:39 colder Exp $
#
all: html
@@ -204,14 +204,14 @@
for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file html/figures/$$sect.$$name; fi; done; done;
$(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/
+ $(PHP) -q $(scriptdir)/html_syntax.php html dsssl html/
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(HACK_RTL_LANGS_PAGES)
# still needs more tweaks!!
html_xsl: manual.xml images_html
${XSLTPROC} $(PHPXSL)/html.xsl manual.xml
- $(PHP) -q $(scriptdir)/html_syntax.php html html/
+ $(PHP) -q $(scriptdir)/html_syntax.php html xsl html/
xul_xsl: manual.xml images_xul
${XSLTPROC} xsl/xul.xsl manual.xml
@@ -231,14 +231,14 @@
phpweb_xsl: manual.xml images_php
${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
- $(PHP) -q $(scriptdir)/html_syntax.php php php/
+ $(PHP) -q $(scriptdir)/html_syntax.php php xsl php/
#$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
$(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) -q $(scriptdir)/html_syntax.php php dsssl php/
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` remove
$(HACK_RTL_LANGS_PHPWEB)
http://cvs.php.net/viewvc.cgi/phpdoc/scripts/html_syntax.php?r1=1.14&r2=1.15&diff_format=u
Index: phpdoc/scripts/html_syntax.php
diff -u phpdoc/scripts/html_syntax.php:1.14 phpdoc/scripts/html_syntax.php:1.15
--- phpdoc/scripts/html_syntax.php:1.14 Sat Feb 10 11:42:27 2007
+++ phpdoc/scripts/html_syntax.php Tue Feb 20 21:17:39 2007
@@ -18,20 +18,28 @@
+--+
*/
-if ($_SERVER["argc"] < 3) {
+if ($_SERVER["argc"] < 4) {
exit("Purpose: Syntax highlight PHP examples in DSSSL generated HTML
manual.\n"
- .'Usage: html_syntax.php [ "html" | "php" ] [ filename.ext |
dir | wildcard ] ...' ."\n"
+ .'Usage: html_syntax.php [ "html" | "php" ] [ "xsl" | "dsssl" ]
[ filename.ext | dir | wildcard ] ...' ."\n"
.'"html" - highlight_string() is applied, "php" -
highlight_php() is added' ."\n"
);
}
set_time_limit(5*60); // can run long, but not more than 5 minutes
+function callback_html_number_entities_decode($matches) {
+ return chr($matches[1]);
+}
+
function callback_highlight_php($matches) {
- $matches[1] = trim($matches[1]);
- if ($GLOBALS["TYPE"] == "php") {
- return "\n\n";
+if ($GLOBALS['DECODE'] === true) {
+$with_tags = preg_replace_callback("!&#([0-9]+);!",
"callback_html_number_entities_decode", trim($matches[1]));
+} else {
+$with_tags = trim($matches[1]);
+}
+if ($GLOBALS["TYPE"] == "php") {
+ return "\n\n";
} else { // "html"
- return highlight_string($matches[1], true);
+ return highlight_string($with_tags, true);
}
}
@@ -71,6 +79,10 @@
$files = $_SERVER["argv"];
array_shift($files); // $argv[0] - script filename
$TYPE = array_shift($files); // "html" or "php"
+
+$build_medium = array_shift($files);
+$DECODE = ($build_medium !== "xsl");
+
while (($file = array_shift($files)) !== null) {
if (is_file($file)) {
$process = array($file);
[PHP-DOC] cvs: phpdoc / Makefile.in
rquadling Mon Feb 19 15:40:59 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Stupid bl**dy line wrapping nano!
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.190&r2=1.191&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.190 phpdoc/Makefile.in:1.191
--- phpdoc/Makefile.in:1.190Mon Feb 19 15:21:13 2007
+++ phpdoc/Makefile.in Mon Feb 19 15:40:59 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.190 2007/02/19 15:21:13 rquadling Exp $
+# $Id: Makefile.in,v 1.191 2007/02/19 15:40:59 rquadling Exp $
#
all: html
@@ -109,9 +109,7 @@
images_htmlhelp:
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
htmlhelp/html/figures
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in
-$$i/*; do if test -f $$file; then name=`basename $$file`; cp $$file
htmlhelp/html/figures/$$sect.$$name; fi;
-done; done;
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/html/figures/$$sect.$$name; fi; done; done;
html: html/index.html
bightml: @[EMAIL PROTECTED]
Re: [PHP-DOC] cvs: phpdoc / Makefile.in
On 2/19/07, Richard Quadling <[EMAIL PROTECTED]> wrote:
rquadling Mon Feb 19 15:21:13 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
images_htmlhelp should be moved to htmlhelp/html/figures and not
htmlhelp/figures
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.189&r2=1.190&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.189 phpdoc/Makefile.in:1.190
--- phpdoc/Makefile.in:1.189Wed Feb 14 20:52:22 2007
+++ phpdoc/Makefile.in Mon Feb 19 15:21:13 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.189 2007/02/14 20:52:22 bjori Exp $
+# $Id: Makefile.in,v 1.190 2007/02/19 15:21:13 rquadling Exp $
#
all: html
@@ -109,7 +109,9 @@
images_htmlhelp:
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
htmlhelp/html/figures
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/figures/$$sect.$$name; fi; done; done;
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in
+$$i/*; do if test -f $$file; then name=`basename $$file`; cp $$file
htmlhelp/html/figures/$$sect.$$name; fi;
+done; done;
Nice catch, but this wont work, has to be one line...
html: html/index.html
bightml: @[EMAIL PROTECTED]
[PHP-DOC] cvs: phpdoc / Makefile.in
rquadling Mon Feb 19 15:21:13 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
images_htmlhelp should be moved to htmlhelp/html/figures and not
htmlhelp/figures
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.189&r2=1.190&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.189 phpdoc/Makefile.in:1.190
--- phpdoc/Makefile.in:1.189Wed Feb 14 20:52:22 2007
+++ phpdoc/Makefile.in Mon Feb 19 15:21:13 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.189 2007/02/14 20:52:22 bjori Exp $
+# $Id: Makefile.in,v 1.190 2007/02/19 15:21:13 rquadling Exp $
#
all: html
@@ -109,7 +109,9 @@
images_htmlhelp:
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
htmlhelp/html/figures
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/figures/$$sect.$$name; fi; done; done;
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in
+$$i/*; do if test -f $$file; then name=`basename $$file`; cp $$file
htmlhelp/html/figures/$$sect.$$name; fi;
+done; done;
html: html/index.html
bightml: @[EMAIL PROTECTED]
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Wed Feb 14 20:52:22 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Replace the zend-images-workaround with more generic solution
(was already 90% implemented, mainly just refactoring...)
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.188&r2=1.189&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.188 phpdoc/Makefile.in:1.189
--- phpdoc/Makefile.in:1.188Sat Feb 10 18:06:07 2007
+++ phpdoc/Makefile.in Wed Feb 14 20:52:22 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.188 2007/02/10 18:06:07 bjori Exp $
+# $Id: Makefile.in,v 1.189 2007/02/14 20:52:22 bjori Exp $
#
all: html
@@ -60,11 +60,11 @@
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
+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
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
+PRINT_DEPS=$(PRINT_STYLESHEET) $(PHPDSSSL)/common.dsl.in
$(PHPDSSSL)/print.dsl.in images
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/common.dsl images_php
KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile
[EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED]
@@ -91,25 +91,25 @@
.manual.xml: $(DEPEND_FILES) entities/global.ent
touch .manual.xml
-zendapi:
- cp $(srcdir)/en/internals/zendapi/figures/*.png .
+images:
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file $$sect.$$name; fi; done; done;
-zendapihtml:
+images_html:
rm -rf html && mkdir html && mkdir html/figures
- cp $(srcdir)/en/internals/zendapi/figures/*.png ./html/figures
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file html/figures/$$sect.$$name; fi; done; done;
-zendapixul:
+images_xul:
rm -rf xul && mkdir xul
@if test "@FIGURES@" != ""; then mkdir xul/@FIGURES@ ; fi
- @ZEND_FIGURES_HTML@
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file xul/@FIGURES@/$$sect.$$name; fi; done; done;
-zendapiphp:
+images_php:
rm -rf php && mkdir php && mkdir php/figures
- cp $(srcdir)/en/internals/zendapi/figures/*.png ./php/figures
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file php/figures/$$sect.$$name; fi; done; done;
-zendapihtmlhelp:
+images_htmlhelp:
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
htmlhelp/html/figures
- cp $(srcdir)/en/internals/zendapi/figures/*.png ./htmlhelp/html/figures
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/figures/$$sect.$$name; fi; done; done;
html: html/index.html
bightml: @[EMAIL PROTECTED]
@@ -209,35 +209,32 @@
$(HACK_RTL_LANGS_PAGES)
# still needs more tweaks!!
-html_xsl: manual.xml zendapihtml
+html_xsl: manual.xml images_html
${XSLTPROC} $(PHPXSL)/html.xsl manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php html html/
-xul_xsl: manual.xml zendapixul
+xul_xsl: manual.xml images_xul
${XSLTPROC} xsl/xul.xsl manual.xml
-bightml_xsl: manual.xml zendapi
+bightml_xsl: manual.xml images
${XSLTPROC} -o @[EMAIL PROTECTED] $(PHPXSL)/bightml.xsl manual.xml
-fo: manual.xml zendapi
+fo: manual.xml images
${XSLTPROC} -o manual.fo $(PHPXSL)/fo.xsl manual.xml
howto_xsl:
rm -rf ./howto/html && mkdir ./howto/html
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
-chm_xsl: manual.xml zendapihtmlhelp
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/html/figures/$$sect.$$name; fi; done; done;
+chm_xsl: manual.xml images_htmlhelp
${XSLTPROC} $(
[PHP-DOC] cvs: phpdoc / Makefile.in
rquadling Fri Feb 9 16:16:08 2007 UTC Modified files: /phpdoc Makefile.in Log: Removed unused, unworking, recently added as a test, chm_normal http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.186&r2=1.187&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.186 phpdoc/Makefile.in:1.187 --- phpdoc/Makefile.in:1.186Tue Feb 6 14:48:01 2007 +++ phpdoc/Makefile.in Fri Feb 9 16:16:07 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.186 2007/02/06 14:48:01 bjori Exp $ +# $Id: Makefile.in,v 1.187 2007/02/09 16:16:07 rquadling Exp $ # all: html @@ -280,10 +280,6 @@ chm: html FORCE chm/make_chm.bat $(LANG) -# RAQ : Monday, 5 February 2007 10:04 am : Build the normal chm rather than the fancy (make chm) or extended chm (make chm_xsl, htmlhtml/make_chm.bat, etc.) -chm_nonfancy: html FORCE - chm/make_chm.bat $(LANG) normal - # File endings we are going to define general rules for: .SUFFIXES: .html .xml .sgml .tex .dvi .ps .pdf .rtf .gz .bz2 .txt .PRECIOUS: %.html %.dvi
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Tue Feb 6 14:48:01 2007 UTC Modified files: /phpdoc Makefile.in Log: Have xsltproc always print out something (i.e. version info) when its finished http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.185&r2=1.186&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.185 phpdoc/Makefile.in:1.186 --- phpdoc/Makefile.in:1.185Mon Feb 5 18:01:38 2007 +++ phpdoc/Makefile.in Tue Feb 6 14:48:01 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.185 2007/02/05 18:01:38 bjori Exp $ +# $Id: Makefile.in,v 1.186 2007/02/06 14:48:01 bjori Exp $ # all: html @@ -35,7 +35,7 @@ [EMAIL PROTECTED]@ @JADE@ -D . -wno-idref [EMAIL PROTECTED]@ @NSGMLS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -V [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Mon Feb 5 18:01:39 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Add comments about the downloadable html file build using DSSSL
Comment out fixphpweb.php for phpweb_xsl, isn't used atm
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.184&r2=1.185&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.184 phpdoc/Makefile.in:1.185
--- phpdoc/Makefile.in:1.184Mon Feb 5 10:04:07 2007
+++ phpdoc/Makefile.in Mon Feb 5 18:01:38 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.184 2007/02/05 10:04:07 rquadling Exp $
+# $Id: Makefile.in,v 1.185 2007/02/05 18:01:38 bjori Exp $
#
all: html
@@ -68,8 +68,10 @@
KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile
[EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED]
+# DSL
+#MIRROR_TARGETS=phpweb html/index.html $(DIST_FILES)
+# Note DSSL is still used for the downloadable html - but will be replaced
by XSL ASAP
MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES)
-#MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES)
[EMAIL PROTECTED]@.pdf.bz2
@@ -231,7 +233,7 @@
for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file php/figures/$$sect.$$name; fi; done; done;
${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php php php/
- $(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
+ #$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file php/figures/$$sect.$$name; fi; done; done;
[PHP-DOC] cvs: phpdoc / Makefile.in
rquadling Mon Feb 5 10:04:07 2007 UTC Modified files: /phpdoc Makefile.in Log: Add an additional make option for the non fancy windows CHM file. http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.183&r2=1.184&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.183 phpdoc/Makefile.in:1.184 --- phpdoc/Makefile.in:1.183Sat Feb 3 11:56:51 2007 +++ phpdoc/Makefile.in Mon Feb 5 10:04:07 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.183 2007/02/03 11:56:51 bjori Exp $ +# $Id: Makefile.in,v 1.184 2007/02/05 10:04:07 rquadling Exp $ # all: html @@ -278,6 +278,10 @@ chm: html FORCE chm/make_chm.bat $(LANG) +# RAQ : Monday, 5 February 2007 10:04 am : Build the normal chm rather than the fancy (make chm) or extended chm (make chm_xsl, htmlhtml/make_chm.bat, etc.) +chm_nonfancy: html FORCE + chm/make_chm.bat $(LANG) normal + # File endings we are going to define general rules for: .SUFFIXES: .html .xml .sgml .tex .dvi .ps .pdf .rtf .gz .bz2 .txt .PRECIOUS: %.html %.dvi
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Sat Feb 3 11:56:51 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
distclean should also delete config.cache config.status missing-entities.out
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.182&r2=1.183&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.182 phpdoc/Makefile.in:1.183
--- phpdoc/Makefile.in:1.182Sat Feb 3 11:47:44 2007
+++ phpdoc/Makefile.in Sat Feb 3 11:56:51 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.182 2007/02/03 11:47:44 bjori Exp $
+# $Id: Makefile.in,v 1.183 2007/02/03 11:56:51 bjori Exp $
#
all: html
@@ -366,6 +366,7 @@
distclean: clean
for file in `find . -name "*.in"`; do rm -f `dirname $$file`/`basename
$$file .in`; done
+ rm -f config.cache config.status missing-entities.out
# }}}
# {{{ tree utils
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Sat Feb 3 11:47:44 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Dont error out if rm cant find the file
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.181&r2=1.182&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.181 phpdoc/Makefile.in:1.182
--- phpdoc/Makefile.in:1.181Wed Jan 31 12:29:12 2007
+++ phpdoc/Makefile.in Sat Feb 3 11:47:44 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.181 2007/01/31 12:29:12 bjori Exp $
+# $Id: Makefile.in,v 1.182 2007/02/03 11:47:44 bjori Exp $
#
all: html
@@ -365,7 +365,7 @@
rm -f @LANGDIR@/missing-ids.xml
distclean: clean
- for file in `find . -name "*.in"`; do rm `dirname $$file`/`basename
$$file .in`; done
+ for file in `find . -name "*.in"`; do rm -f `dirname $$file`/`basename
$$file .in`; done
# }}}
# {{{ tree utils
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Wed Jan 31 12:29:12 2007 UTC Modified files: /phpdoc Makefile.in Log: Change the "mirror-files" target to build phpweb_xsl rather than dl # html_xsl will follow later http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.180&r2=1.181&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.180 phpdoc/Makefile.in:1.181 --- phpdoc/Makefile.in:1.180Tue Jan 30 18:28:41 2007 +++ phpdoc/Makefile.in Wed Jan 31 12:29:12 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.180 2007/01/30 18:28:41 bjori Exp $ +# $Id: Makefile.in,v 1.181 2007/01/31 12:29:12 bjori Exp $ # all: html @@ -68,7 +68,7 @@ KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile [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) #MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES)
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Tue Jan 30 18:28:41 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Add images & PHP syntax highlighting to XSL build
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.179&r2=1.180&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.179 phpdoc/Makefile.in:1.180
--- phpdoc/Makefile.in:1.179Thu Jan 25 16:54:09 2007
+++ phpdoc/Makefile.in Tue Jan 30 18:28:41 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.179 2007/01/25 16:54:09 rquadling Exp $
+# $Id: Makefile.in,v 1.180 2007/01/30 18:28:41 bjori Exp $
#
all: html
@@ -228,7 +228,9 @@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file php/figures/$$sect.$$name; fi; done; done;
${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
+ $(PHP) -q $(scriptdir)/html_syntax.php php php/
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
[PHP-DOC] cvs: phpdoc / Makefile.in
rquadling Thu Jan 25 16:54:10 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Grab images from extension specific locations for inclusion into the HTML
build process for CHM_XSL
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.178&r2=1.179&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.178 phpdoc/Makefile.in:1.179
--- phpdoc/Makefile.in:1.178Mon Jan 22 22:20:02 2007
+++ phpdoc/Makefile.in Thu Jan 25 16:54:09 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.178 2007/01/22 22:20:02 nlopess Exp $
+# $Id: Makefile.in,v 1.179 2007/01/25 16:54:09 rquadling Exp $
#
all: html
@@ -224,6 +224,7 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
chm_xsl: manual.xml zendapihtmlhelp
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file htmlhelp/html/figures/$$sect.$$name; fi; done; done;
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Mon Jan 22 22:20:02 2007 UTC Modified files: /phpdoc Makefile.in Log: make 'make clean' also remove infiles.cache http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.177&r2=1.178&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.177 phpdoc/Makefile.in:1.178 --- phpdoc/Makefile.in:1.177Mon Jan 22 16:01:20 2007 +++ phpdoc/Makefile.in Mon Jan 22 22:20:02 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.177 2007/01/22 16:01:20 bjori Exp $ +# $Id: Makefile.in,v 1.178 2007/01/22 22:20:02 nlopess Exp $ # all: html @@ -356,7 +356,7 @@ rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] .manual.xml rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest rm -f *.aux *.tex *.log *.dvi *.toc *.ps *.gz - rm -f status.txt missing.txt + rm -f status.txt missing.txt infiles.cache rm -f entities/file-entities.ent rm -f entities/missing* rm -f @LANGDIR@/missing-ids.xml
[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
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Fri Jan 19 20:14:13 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Apparently linux doesn't understand that you don't always want to overwrite
existing files *sigh*
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.175&r2=1.176&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.175 phpdoc/Makefile.in:1.176
--- phpdoc/Makefile.in:1.175Fri Jan 19 19:46:22 2007
+++ phpdoc/Makefile.in Fri Jan 19 20:14:12 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.175 2007/01/19 19:46:22 bjori Exp $
+# $Id: Makefile.in,v 1.176 2007/01/19 20:14:12 bjori Exp $
#
all: html
@@ -192,7 +192,7 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
html/index.html: manual.xml $(HTML_DEPS)
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp -n $$file html/figures/$$sect.$$name; fi; done; done;
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file html/figures/$$sect.$$name; fi; done; done;
$(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/
@@ -224,7 +224,7 @@
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
- for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp -n $$file php/figures/$$sect.$$name; fi; done; done;
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp $$file php/figures/$$sect.$$name; fi; done; done;
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
[PHP-DOC] cvs: phpdoc / Makefile.in
bjori Fri Jan 19 19:46:22 2007 UTC
Modified files:
/phpdoc Makefile.in
Log:
Copy images from "figures/" into target/figures/refname.imagename
# Example: en/refrence/image/functions/imagecreate.xml
#
#
#
# Put "imagecreate.png" into en/reference/image/figures/
# make phpweb will then produce:
#
# And copys en/reference/image/figures/imagecreate.png to
php/figures/image.imagecreate.png
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.174&r2=1.175&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.174 phpdoc/Makefile.in:1.175
--- phpdoc/Makefile.in:1.174Sat Jan 13 21:19:17 2007
+++ phpdoc/Makefile.in Fri Jan 19 19:46:22 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.174 2007/01/13 21:19:17 bjori Exp $
+# $Id: Makefile.in,v 1.175 2007/01/19 19:46:22 bjori Exp $
#
all: html
@@ -192,6 +192,7 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
html/index.html: manual.xml $(HTML_DEPS)
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp -n $$file html/figures/$$sect.$$name; fi; done; done;
$(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/
@@ -223,6 +224,7 @@
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
+ for i in `find en -type d -name figures`; do sect=`echo $$i | awk -F\/
'{print $$3}'`; for file in $$i/*; do if test -f $$file; then name=`basename
$$file`; cp -n $$file php/figures/$$sect.$$name; fi; done; done;
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
[PHP-DOC] cvs: phpdoc / Makefile.in /dsssl kdevelop_toc.dsl
bjori Sat Jan 13 21:19:17 2007 UTC Modified files: /phpdoc Makefile.in /phpdoc/dsssl kdevelop_toc.dsl Log: Fix KDevelop TOC generation http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.173&r2=1.174&diff_format=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.173 phpdoc/Makefile.in:1.174 --- phpdoc/Makefile.in:1.173Mon Jan 1 15:32:27 2007 +++ phpdoc/Makefile.in Sat Jan 13 21:19:17 2007 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.173 2007/01/01 15:32:27 didou Exp $ +# $Id: Makefile.in,v 1.174 2007/01/13 21:19:17 bjori Exp $ # all: html @@ -176,7 +176,7 @@ kdevelop_toc: php.toc php.toc: manual.xml $(KDEVELOP_TOC_DEPS) - echo '' > $@ + echo '' > $@ $(JADE) $(CATALOG) -d $(KDEVELOP_TOC_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e's/\& /\& /g' >> $@ scripts/makedoc: $(scriptdir)/makedoc.cc http://cvs.php.net/viewvc.cgi/phpdoc/dsssl/kdevelop_toc.dsl?r1=1.1&r2=1.2&diff_format=u Index: phpdoc/dsssl/kdevelop_toc.dsl diff -u phpdoc/dsssl/kdevelop_toc.dsl:1.1 phpdoc/dsssl/kdevelop_toc.dsl:1.2 --- phpdoc/dsssl/kdevelop_toc.dsl:1.1 Sun Jan 6 15:42:27 2002 +++ phpdoc/dsssl/kdevelop_toc.dsl Sat Jan 13 21:19:17 2007 @@ -1,12 +1,12 @@ + ]> @@ -18,7 +18,7 @@ "UNREGISTERED::James Clark//Flow Object Class::element") (element book - (make element gi: "gideontoc" + (make element gi: "kdeveloptoc" (make sequence (make element gi: "title" (literal "PHP")) (make element gi: "base" attributes: (list (list "href" "NO")) (empty-sosofo))
[PHP-DOC] cvs: phpdoc / Makefile.in
wez Sat Sep 10 12:20:30 2005 EDT Modified files: /phpdoc Makefile.in Log: use portable test -f instead of test -e http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.169&r2=1.170&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.169 phpdoc/Makefile.in:1.170 --- phpdoc/Makefile.in:1.169Sun Aug 21 12:27:02 2005 +++ phpdoc/Makefile.in Sat Sep 10 12:20:28 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.169 2005/08/21 16:27:02 goba Exp $ +# $Id: Makefile.in,v 1.170 2005/09/10 16:20:28 wez Exp $ # all: html @@ -165,7 +165,7 @@ quickref: quickref.txt quickref.txt: FORCE - @if test ! -e funcindex.xml; then touch funcindex.xml; fi + @if test ! -f funcindex.xml; then touch funcindex.xml; fi $(XSLTPROC) -o quickref.txt $(QUICKREF_XSL_SHEET) manual.xml kdevelop_toc: php.toc @@ -307,22 +307,22 @@ # test all possible errors 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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -f funcindex.xml; then touch funcindex.xml; fi + @if test ! -f entities/missing-entities.ent; then touch entities/missing-entities.ent; fi + @if test ! -f 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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -f funcindex.xml; then touch funcindex.xml; fi + @if test ! -f entities/missing-entities.ent; then touch entities/missing-entities.ent; fi + @if test ! -f 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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -f funcindex.xml; then touch funcindex.xml; fi + @if test ! -f entities/missing-entities.ent; then touch entities/missing-entities.ent; fi + @if test ! -f entities/missing-ids.xml; then touch entities/missing-ids.xml; fi $(XMLLINT) --noent --noout --valid manual.xml test_howto:
[PHP-DOC] cvs: phpdoc / Makefile.in /chm common.php make_chm.bat make_chm.php make_chm_fancy.php /en make_chm_index.html make_chm_index_en.html /scripts revcheck.php
nlopess Sun Jul 10 13:34:59 2005 EDT
Added files:
/phpdoc/en make_chm_index.html
Removed files:
/phpdoc/en make_chm_index_en.html
Modified files:
/phpdoc/scripts revcheck.php
/phpdoc/chm common.php make_chm.bat make_chm.php make_chm_fancy.php
/phpdoc Makefile.in
Log:
backport my fixes from smarty docs to chm scripts:
* add a simple 'make chm' option
* allow the main page to be localized
* update the contributors list
http://cvs.php.net/diff.php/phpdoc/scripts/revcheck.php?r1=1.50&r2=1.51&ty=u
Index: phpdoc/scripts/revcheck.php
diff -u phpdoc/scripts/revcheck.php:1.50 phpdoc/scripts/revcheck.php:1.51
--- phpdoc/scripts/revcheck.php:1.50Sat Jul 2 15:11:58 2005
+++ phpdoc/scripts/revcheck.php Sun Jul 10 13:34:58 2005
@@ -326,8 +326,7 @@
// If we found a file functions.xml in the
// /reference/ tree, skip the file
if (
- $file == "make_chm_index_en.html"
- || $file == "rsusi.txt"
+ $file == "rsusi.txt"
|| $file == "README"
|| $file == "contributors.xml"
|| $file == "contributors.ent"
http://cvs.php.net/diff.php/phpdoc/chm/common.php?r1=1.3&r2=1.4&ty=u
Index: phpdoc/chm/common.php
diff -u phpdoc/chm/common.php:1.3 phpdoc/chm/common.php:1.4
--- phpdoc/chm/common.php:1.3 Mon May 12 12:14:31 2003
+++ phpdoc/chm/common.php Sun Jul 10 13:34:59 2005
@@ -5,18 +5,6 @@
$LANGUAGE = getenv("PHP_HELP_COMPILE_LANG");
$INTERNAL_CHARSET = "UTF-8";
-// backwards compatibility
-if (!function_exists("file_get_contents")) {
-function file_get_contents($file)
-{
-$cnt = file($file);
-if ($cnt !== false) {
-return join('', $cnt);
-}
-return false;
-}
-}
-
// Return a file joined on one line
function oneLiner($filename, $only_tags = false)
{
@@ -73,7 +61,7 @@
// Returns the name of character set in the given document
function detectDocumentCharset($doc)
{
-if
(preg_match("//iU",
$doc, $reg)) {
+if (preg_match('/]+CHARSET=["\'\s]?([\w\d-]+)["\'\s]?\s*>/iS',
$doc, $reg)) {
return $reg[1];
}
return false;
http://cvs.php.net/diff.php/phpdoc/chm/make_chm.bat?r1=1.2&r2=1.3&ty=u
Index: phpdoc/chm/make_chm.bat
diff -u phpdoc/chm/make_chm.bat:1.2 phpdoc/chm/make_chm.bat:1.3
--- phpdoc/chm/make_chm.bat:1.2 Sun May 19 05:29:58 2002
+++ phpdoc/chm/make_chm.bat Sun Jul 10 13:34:59 2005
@@ -3,20 +3,17 @@
rem !! Please read the make_chm.README file for information
rem !! about how to build a "php_manual_lang.chm" file.
-rem Path of the PHP CGI executable
-set PHP_PATH=D:\progra~1\php404\php.exe
+rem Path of the PHP CLI executable
+set PHP_PATH=php
rem Path of the Help Compiler command line tool
-set PHP_HELP_COMPILER=D:\progra~1\helpwo~1\hhc.exe
-
-rem The language of the manual to compile
-set PHP_HELP_COMPILE_LANG=en
+set PHP_HELP_COMPILER=C:\progra~1\htmlhe~1\hhc.exe
rem The source directory with the original DSSSL made HTML
set PHP_HELP_COMPILE_DIR=html
rem The directory, where the fancy files need to be copied
-set PHP_HELP_COMPILE_FANCYDIR=fancy
+set PHP_HELP_COMPILE_FANCYDIR=chm\fancy
rem ==
rem !DO NOT MODIFY ANYTHING BELOW THIS LINE !
@@ -24,13 +21,16 @@
echo.
-if a%1a == anormala goto skipfancy
+set PHP_HELP_COMPILE_LANG=%1
+if "%1" == "" set PHP_HELP_COMPILE_LANG=en
+
+echo Language choosen: %PHP_HELP_COMPILE_LANG%
+
+if a%2a == anormala goto skipfancy
echo Now generating the fancy manual in %PHP_HELP_COMPILE_FANCYDIR% dir...
IF NOT EXIST %PHP_HELP_COMPILE_FANCYDIR%\NUL md %PHP_HELP_COMPILE_FANCYDIR%
-IF NOT EXIST %PHP_HELP_COMPILE_FANCYDIR%\figures md
%PHP_HELP_COMPILE_FANCYDIR%\figures
-copy %PHP_HELP_COMPILE_DIR%\figures\*.* %PHP_HELP_COMPILE_FANCYDIR%\figures\*.*
-%PHP_PATH% -q make_chm_fancy.php
+%PHP_PATH% chm\make_chm_fancy.php
goto normal
@@ -41,14 +41,14 @@
:normal
echo Now running the toc and project file generator script...
-%PHP_PATH% -q make_chm.php
+%PHP_PATH% chm\make_chm.php
echo Compiling the actual helpfile (php_manual_%PHP_HELP_COMPILE_LANG%.chm)...
-%PHP_HELP_COMPILER% php_manual_%PHP_HELP_COMPILE_LANG%.hhp
+%PHP_HELP_COMPILER% chm\php_manual_%PHP_HELP_COMPILE_LANG%.hhp
echo.
echo Cleaning up the directory
-rem del php_manual_%PHP_HELP_COMPILE_LANG%.hh?
+del chm\php_manual_%PHP_HELP_COMPILE_LANG%.hh?
echo Done!
echo.
http://cvs.php.net/diff.php/phpdoc/chm/make_chm.php?r1=1.23&r2=1.24&ty=u
Index: phpdoc/chm/make_chm.php
diff -u phpdoc/chm/make_chm.php:1.23 phpdoc/chm/make_chm.php:1.24
--- phpdoc/chm/make_chm.php:1.23Wed Apr 27 13:07:06 2005
+++ phpdoc/chm/make_chm.php Sun Jul 10 13:34:59 2005
@@ -19,11 +19,11 @@
// Files on the top level of the TOC
$MAIN_FILES = array(
"getting-started.html",
+"install.html",
"langref.html",
"security.html",
"features.html",
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Mon Apr 11 16:38:08 2005 EDT
Modified files:
/phpdoc Makefile.in
Log:
+ use genfuncsummary.php instead of both genfuncsummary.sh
and funcsummary.awk in phpdoc/scripts
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.166&r2=1.167&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.166 phpdoc/Makefile.in:1.167
--- phpdoc/Makefile.in:1.166Sun Apr 3 11:34:29 2005
+++ phpdoc/Makefile.in Mon Apr 11 16:38:08 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.166 2005/04/03 15:34:29 techtonik Exp $
+# $Id: Makefile.in,v 1.167 2005/04/11 20:38:08 techtonik Exp $
#
all: html
@@ -128,7 +128,7 @@
fi
funcsummary.txt: FORCE
- $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt
+ $(PHP) -C -q $(scriptdir)/genfuncsummary.php $(PHP_SOURCE) >
funcsummary.txt
revcheck.html: FORCE
PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php
$(LANGDIR) > revcheck.html
@@ -333,7 +333,7 @@
# {{{ cleanup
clean:
- rm -rf html php fancy figures howto/html howto/php
+ rm -rf html php fancy howto/html howto/php htmlhelp/html
rm -f @[EMAIL PROTECTED] [a-z]*.html @[EMAIL PROTECTED] manual.info
rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] .manual.xml
rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sun Apr 3 11:34:30 2005 EDT Modified files: /phpdoc Makefile.in Log: - fix directory changes for cgi http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.165&r2=1.166&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.165 phpdoc/Makefile.in:1.166 --- phpdoc/Makefile.in:1.165Sun Apr 3 07:53:24 2005 +++ phpdoc/Makefile.in Sun Apr 3 11:34:29 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.165 2005/04/03 11:53:24 techtonik Exp $ +# $Id: Makefile.in,v 1.166 2005/04/03 15:34:29 techtonik Exp $ # all: html @@ -116,7 +116,7 @@ echo " which were not found by configure" ;\ echo " aborting " ;\ else \ - $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt ;\ + $(PHP) -C -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt ;\ fi; \ if test "$(PECL_SOURCE)" = "no" -a ! "$(PHP_SOURCE)" = "no"; then \ echo "WARNING: pecl sources not found - pecl functions" ;\ @@ -124,7 +124,7 @@ elif test ! "$(PHP_SOURCE)" = "no"; then \ echo "" >> funclist.txt ;\ echo "# - PECL Stuff - " >> funclist.txt ;\ -$(PHP) -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) >> funclist.txt ;\ +$(PHP) -C -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) >> funclist.txt ;\ fi funcsummary.txt: FORCE
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sun Apr 3 07:53:26 2005 EDT Modified files: /phpdoc Makefile.in Log: + include PECL functions in funclist.txt (not a fine solution, but i dk how to make nested "if" statement work on my pc) http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.164&r2=1.165&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.164 phpdoc/Makefile.in:1.165 --- phpdoc/Makefile.in:1.164Sat Apr 2 16:30:54 2005 +++ phpdoc/Makefile.in Sun Apr 3 07:53:24 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.164 2005/04/02 21:30:54 techtonik Exp $ +# $Id: Makefile.in,v 1.165 2005/04/03 11:53:24 techtonik Exp $ # all: html @@ -28,6 +28,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/scripts [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -D . @@ -110,7 +111,21 @@ FORCE: funclist.txt: FORCE - $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt + @if test "$(PHP_SOURCE)" = "no"; then \ + echo "WARNING: recreating the function list needs php sources" ;\ + echo " which were not found by configure" ;\ + echo " aborting " ;\ + else \ + $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt ;\ + fi; \ +if test "$(PECL_SOURCE)" = "no" -a ! "$(PHP_SOURCE)" = "no"; then \ +echo "WARNING: pecl sources not found - pecl functions" ;\ +echo " will not be present in funclist.txt" ;\ +elif test ! "$(PHP_SOURCE)" = "no"; then \ +echo "" >> funclist.txt ;\ +echo "# - PECL Stuff - " >> funclist.txt ;\ +$(PHP) -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) >> funclist.txt ;\ +fi funcsummary.txt: FORCE $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sat Apr 2 16:30:57 2005 EDT Modified files: /phpdoc Makefile.in Log: + genfunclist.php generator instead of genfunclist.sh and funcparse.awk http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.163&r2=1.164&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.163 phpdoc/Makefile.in:1.164 --- phpdoc/Makefile.in:1.163Sun Mar 20 09:49:17 2005 +++ phpdoc/Makefile.in Sat Apr 2 16:30:54 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.163 2005/03/20 14:49:17 nlopess Exp $ +# $Id: Makefile.in,v 1.164 2005/04/02 21:30:54 techtonik Exp $ # all: html @@ -110,7 +110,7 @@ FORCE: funclist.txt: FORCE - $(scriptdir)/genfunclist.sh $(PHP_SOURCE) > funclist.txt + $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt funcsummary.txt: FORCE $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt @@ -126,8 +126,8 @@ touch funcindex.xml ;\ else \ $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\ - echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml ;\ + echo "$(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\ + $(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt > funcindex.xml ;\ rm -f quickref-temp.txt ;\ fi
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)
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Tue Mar 8 14:51:16 2005 EDT Modified files: /phpdoc Makefile.in Log: fix a problem in 'make' when *not* using Zend API docs http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.161&r2=1.162&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.161 phpdoc/Makefile.in:1.162 --- phpdoc/Makefile.in:1.161Sun Mar 6 14:11:34 2005 +++ phpdoc/Makefile.in Tue Mar 8 14:51:13 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.161 2005/03/06 19:11:34 techtonik Exp $ +# $Id: Makefile.in,v 1.162 2005/03/08 19:51:13 nlopess Exp $ # all: html @@ -84,11 +84,13 @@ @ZEND_FIGURES@ zendapihtml: - rm -rf html && mkdir html && mkdir html/@FIGURES@ + rm -rf html && mkdir html + @if test "@FIGURES@" != ""; then mkdir html/@FIGURES@ ; fi @ZEND_FIGURES_HTML@ zendapiphp: - rm -rf php && mkdir php && mkdir php/@FIGURES@ + rm -rf php && mkdir php + @if test "@FIGURES@" != ""; then mkdir php/@FIGURES@ ; fi @ZEND_FIGURES_PHP@ html: html/index.html
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
derick Fri Feb 11 10:57:49 2005 EDT
Modified files:
/phpdoc Makefile.in
Log:
- Tweak for tar so that we actually can tar up more than 4096 files :)
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.158&r2=1.159&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.158 phpdoc/Makefile.in:1.159
--- phpdoc/Makefile.in:1.158Wed Feb 9 18:45:58 2005
+++ phpdoc/Makefile.in Fri Feb 11 10:57:49 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.158 2005/02/09 23:45:58 hholzgra Exp $
+# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
#
all: html
@@ -168,6 +168,7 @@
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,6 +178,7 @@
# 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
@@ -221,10 +223,10 @@
-rm -f $@ && (cd html; zip -R -9 -q ../$@ *.html *.png)
@[EMAIL PROTECTED]: html/index.html
- -rm -f $@ && (cd html; tar -cf - *.html @FIGURES@) | gzip -9 > $@
+ -rm -f $@ && (tar -cf - html) | gzip -9 > $@
@[EMAIL PROTECTED]: html/index.html
- -rm -f $@ && (cd html; tar -cf - *.html @FIGURES@) | bzip2 -9 > $@
+ -rm -f $@ && (tar -cf - html) | bzip2 -9 > $@
howto/php/index.php: howto/howto.xml $(HOWTO_DEPS)
@test -d howto/php || mkdir howto/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
techtonik Mon Nov 15 14:17:58 2004 EDT Modified files: /phpdoc Makefile.in Log: * generate funcindex.xml through XSL template * use -o option to xsltproc to get unix linefeeds in output file * remove redundant quickref.dsl from building process http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.156&r2=1.157&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.156 phpdoc/Makefile.in:1.157 --- phpdoc/Makefile.in:1.156Sun Nov 14 17:33:26 2004 +++ phpdoc/Makefile.in Mon Nov 15 14:17:56 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.156 2004/11/14 22:33:26 techtonik Exp $ +# $Id: Makefile.in,v 1.157 2004/11/15 19:17:56 techtonik Exp $ # all: html @@ -44,7 +44,6 @@ HOWTO_STYLESHEET=dsssl/howto.dsl HOWTOPHP_STYLESHEET=dsssl/howto-php.dsl PRINT_STYLESHEET=dsssl/print.dsl -QUICKREF_STYLESHEET=dsssl/quickref.dsl KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl @@ -124,7 +123,7 @@ echo " reusing old file" ;\ touch funcindex.xml ;\ else \ - $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e 's/ */ /g' | sort -f > quickref-temp.txt ;\ + $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\ echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\ $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml ;\ rm -f quickref-temp.txt ;\ @@ -148,7 +147,7 @@ quickref: quickref.txt quickref.txt: FORCE @if test ! -e funcindex.xml; then touch funcindex.xml; fi - $(XSLTPROC) $(QUICKREF_XSL_SHEET) manual.xml > quickref.txt + $(XSLTPROC) -o quickref.txt $(QUICKREF_XSL_SHEET) manual.xml kdevelop_toc: php.toc php.toc: manual.xml $(KDEVELOP_TOC_DEPS)
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sun Nov 14 17:33:26 2004 EDT Modified files: /phpdoc Makefile.in Log: use XSL to generate quick reference (quickref.xsl) http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.155&r2=1.156&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.155 phpdoc/Makefile.in:1.156 --- phpdoc/Makefile.in:1.155Mon Nov 1 16:12:09 2004 +++ phpdoc/Makefile.in Sun Nov 14 17:33:26 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.155 2004/11/01 21:12:09 derick Exp $ +# $Id: Makefile.in,v 1.156 2004/11/14 22:33:26 techtonik Exp $ # all: html @@ -50,6 +50,7 @@ CHM_XSL_SHEET=xsl/htmlhelp.xsl HOWTO_XSL_SHEET=xsl/howto.xsl +QUICKREF_XSL_SHEET=xsl/quickref.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 @@ -147,7 +148,7 @@ quickref: quickref.txt 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' | sed -e 's/>/>/' | sed -e 's/ quickref.txt kdevelop_toc: php.toc php.toc: manual.xml $(KDEVELOP_TOC_DEPS)
[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
techtonik Tue Oct 5 07:16:55 2004 EDT
Modified files:
/phpdoc Makefile.in
Log:
[ADD] commands to build howto with XSL
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.153&r2=1.154&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.153 phpdoc/Makefile.in:1.154
--- phpdoc/Makefile.in:1.153Wed Sep 8 17:38:52 2004
+++ phpdoc/Makefile.in Tue Oct 5 07:16:52 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.153 2004/09/08 21:38:52 betz Exp $
+# $Id: Makefile.in,v 1.154 2004/10/05 11:16:52 techtonik Exp $
#
all: html
@@ -49,6 +49,7 @@
XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
CHM_XSL_SHEET=xsl/htmlhelp.xsl
+HOWTO_XSL_SHEET=xsl/howto.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
@@ -184,6 +185,10 @@
fo: manual.xml zendapi
${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
+howto_xsl:
+ rm -rf ./howto/html && mkdir ./howto/html
+ ${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
+
chm_xsl: manual.xml
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
@@ -302,6 +307,9 @@
@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
$(XMLLINT) --noent --noout --valid manual.xml
+
+test_howto:
+ $(XMLLINT) --noent --noout --valid ./howto/howto.xml
# }}}
[PHP-DOC] cvs: phpdoc / Makefile.in
betzWed Sep 8 17:38:52 2004 EDT Modified files: /phpdoc Makefile.in Log: missing-ids is in langdir http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.152&r2=1.153&ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.152 phpdoc/Makefile.in:1.153 --- phpdoc/Makefile.in:1.152Thu Sep 2 12:53:53 2004 +++ phpdoc/Makefile.in Wed Sep 8 17:38:52 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.152 2004/09/02 16:53:53 sean Exp $ +# $Id: Makefile.in,v 1.153 2004/09/08 21:38:52 betz Exp $ # all: html @@ -287,20 +287,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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -e @LANGDIR@/missing-ids.xml; then touch @LANGDIR@/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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -e @LANGDIR@/missing-ids.xml; then touch @LANGDIR@/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 entities/missing-ids.xml; then touch entities/missing-ids.xml; fi + @if test ! -e @LANGDIR@/missing-ids.xml; then touch @LANGDIR@/missing-ids.xml; fi $(XMLLINT) --noent --noout --valid manual.xml # }}} @@ -316,7 +316,8 @@ rm -f status.txt missing.txt rm -f entities/file-entities.ent rm -f entities/missing* - + rm -f @LANGDIR@/missing-ids.xml + distclean: clean for file in `find . -name "*.in"`; do rm `dirname $$file`/`basename $$file .in`; done
[PHP-DOC] cvs: phpdoc / Makefile.in /scripts entities.php
seanThu Sep 2 12:53:53 2004 EDT
Modified files:
/phpdoc Makefile.in
/phpdoc/scripts entities.php
Log:
fixed make entities (was pointing at scripts/entities.sh)
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.151&r2=1.152&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.151 phpdoc/Makefile.in:1.152
--- phpdoc/Makefile.in:1.151Tue Aug 24 03:53:48 2004
+++ phpdoc/Makefile.in Thu Sep 2 12:53:53 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.151 2004/08/24 07:53:48 betz Exp $
+# $Id: Makefile.in,v 1.152 2004/09/02 16:53:53 sean Exp $
#
all: html
@@ -71,7 +71,7 @@
@AUTOGENERATED_RULES@
entities: FORCE
- $(srcdir)/scripts/entities.sh
+ $(PHP) -c $(scriptdir) -q $(scriptdir)/entities.php
manual.xml: $(srcdir)/manual.xml.in .manual.xml
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
http://cvs.php.net/diff.php/phpdoc/scripts/entities.php?r1=1.9&r2=1.10&ty=u
Index: phpdoc/scripts/entities.php
diff -u phpdoc/scripts/entities.php:1.9 phpdoc/scripts/entities.php:1.10
--- phpdoc/scripts/entities.php:1.9 Wed Aug 25 04:36:32 2004
+++ phpdoc/scripts/entities.php Thu Sep 2 12:53:53 2004
@@ -17,7 +17,7 @@
| Authors:Gabor Hojtsy <[EMAIL PROTECTED]> |
+--+
- $Id: entities.php,v 1.9 2004/08/25 08:36:32 didou Exp $
+ $Id: entities.php,v 1.10 2004/09/02 16:53:53 sean Exp $
*/
if ($argc > 3 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
@@ -45,7 +45,8 @@
}
// CONFIG SECTION
-$docdir = "../"; // Main directory of the PHP documentation (one dir up in cvs)
+// Main directory of the PHP documentation (one dir up in cvs)
+$docdir = dirname(realpath(__FILE__)) ."/../";
/*/
/* Nothing to modify below this line */
[PHP-DOC] cvs: phpdoc / Makefile.in
betzTue Aug 24 03:53:52 2004 EDT
Modified files:
/phpdoc Makefile.in
Log:
fix for #29792:
clean output folders before a new language build
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.150&r2=1.151&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.150 phpdoc/Makefile.in:1.151
--- phpdoc/Makefile.in:1.150Sat Jun 26 11:24:33 2004
+++ phpdoc/Makefile.in Tue Aug 24 03:53:48 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.150 2004/06/26 15:24:33 goba Exp $
+# $Id: Makefile.in,v 1.151 2004/08/24 07:53:48 betz Exp $
#
all: html
@@ -83,11 +83,11 @@
@ZEND_FIGURES@
zendapihtml:
- @test -d html || mkdir html
+ rm -rf html && mkdir html
@ZEND_FIGURES_HTML@
zendapiphp:
- @test -d php || mkdir php
+ rm -rf php && mkdir php
@ZEND_FIGURES_PHP@
html: html/index.html
@@ -166,7 +166,7 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
html/index.html: manual.xml $(HTML_DEPS)
- @test -d html || mkdir html
+ rm -rf html && mkdir 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/
@@ -175,7 +175,7 @@
# still needs more tweaks!!
html_xsl: manual.xml zendapihtml
- @test -d html || mkdir html
+ rm -rf html && mkdir html
${XSLTPROC} xsl/html.xsl manual.xml
bightml_xsl: manual.xml zendapi
@@ -185,17 +185,17 @@
${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
chm_xsl: manual.xml
- @test -d ./htmlhelp/html || mkdir ./htmlhelp/html
+ rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
- @test -d php || mkdir php
+ 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
- @test -d php || mkdir php
+ 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 /RFC 2003_meeting_findings.txt /dsssl .cvsignore howto-php.dsl.in
gobaSat Jun 26 11:24:33 2004 EDT
Added files:
/phpdoc/dsssl howto-php.dsl.in
Modified files:
/phpdoc Makefile.in
/phpdoc/RFC 2003_meeting_findings.txt
/phpdoc/dsssl .cvsignore
Log:
PHP version of the dochowto for the docweb site, plus update the 2003 meeting report
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.149&r2=1.150&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.149 phpdoc/Makefile.in:1.150
--- phpdoc/Makefile.in:1.149Thu Apr 29 11:19:26 2004
+++ phpdoc/Makefile.in Sat Jun 26 11:24:33 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.149 2004/04/29 15:19:26 nlopess Exp $
+# $Id: Makefile.in,v 1.150 2004/06/26 15:24:33 goba Exp $
#
all: html
@@ -42,6 +42,7 @@
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
QUICKREF_STYLESHEET=dsssl/quickref.dsl
KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
@@ -51,7 +52,7 @@
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
+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
@@ -98,6 +99,7 @@
ps: @[EMAIL PROTECTED]
pdf: @[EMAIL PROTECTED]
howto: howto/html/index.html
+howtophp: howto/php/index.php
howtotgz: howto/howto.html.tar.gz
funcindex: funcindex.xml
revcheck: revcheck.html
@@ -219,6 +221,10 @@
@[EMAIL PROTECTED]: html/index.html
-rm -f $@ && (cd html; tar -cf - *.html @FIGURES@) | bzip2 -9 > $@
+howto/php/index.php: howto/howto.xml $(HOWTO_DEPS)
+ @test -d howto/php || mkdir howto/php
+ -$(JADE) -i lang-en $(CATALOG) -d $(HOWTOPHP_STYLESHEET) -V use-output-dir -t
sgml $(XMLDCL) $(srcdir)/howto/howto.xml
+
howto/html/index.html: howto/howto.xml $(HOWTO_DEPS)
@test -d howto/html || mkdir howto/html
-$(JADE) -i lang-en $(CATALOG) -d $(HOWTO_STYLESHEET) -V use-output-dir -t
sgml $(XMLDCL) $(srcdir)/howto/howto.xml
@@ -302,7 +308,7 @@
# {{{ cleanup
clean:
- rm -rf html php fancy figures howto/html
+ rm -rf html php fancy figures howto/html howto/php
rm -f @[EMAIL PROTECTED] [a-z]*.html @[EMAIL PROTECTED] manual.info
rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] .manual.xml
rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest
http://cvs.php.net/diff.php/phpdoc/RFC/2003_meeting_findings.txt?r1=1.2&r2=1.3&ty=u
Index: phpdoc/RFC/2003_meeting_findings.txt
diff -u phpdoc/RFC/2003_meeting_findings.txt:1.2
phpdoc/RFC/2003_meeting_findings.txt:1.3
--- phpdoc/RFC/2003_meeting_findings.txt:1.2Wed Feb 18 11:06:47 2004
+++ phpdoc/RFC/2003_meeting_findings.txtSat Jun 26 11:24:33 2004
@@ -332,6 +332,8 @@
fix errors in the docs / translation or add examples). In case of translations,
the group should ask those working on the translation too.
+ > DONE (by Derick)
+
11. Misc notes
--
http://cvs.php.net/diff.php/phpdoc/dsssl/.cvsignore?r1=1.1&r2=1.2&ty=u
Index: phpdoc/dsssl/.cvsignore
diff -u phpdoc/dsssl/.cvsignore:1.1 phpdoc/dsssl/.cvsignore:1.2
--- phpdoc/dsssl/.cvsignore:1.1 Mon Jan 7 04:54:37 2002
+++ phpdoc/dsssl/.cvsignore Sat Jun 26 11:24:33 2004
@@ -1,5 +1,6 @@
common.dsl
howto.dsl
+howto-php.dsl
html-locale.dsl
html.dsl
install.dsl
http://cvs.php.net/co.php/phpdoc/dsssl/howto-php.dsl.in?r=1.1&p=1
Index: phpdoc/dsssl/howto-php.dsl.in
+++ phpdoc/dsssl/howto-php.dsl.in
]>
(define %html-ext% ".php")
(define %output-dir% "howto/php")
(define %generate-article-toc%
;; Should a Table of Contents be produced for Articles?
#t)
;; Uncommented, because generates a warning
;;(define (toc-depth nd)
;; 2)
(define %section-autolabel%
;; Are sections enumerated?
#t)
;; Retrieves a node's title from the XML source. Parameters are
;; the current node and title element's name (unused)
(define (docweb-node-title #!optional (nd (current-node)) (title-elem "title"))
(let*
(
(preferred-title-node
(cond
;; For "refentry"s search for the first (and
only one)
;; "refname" from the children list of
"refnamediv" childrens.
(
[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
kennyt Sat Apr 17 12:10:02 2004 EDT
Modified files:
/phpdoc Makefile.in
Log:
added automake target to update working doc tree
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.147&r2=1.148&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.147 phpdoc/Makefile.in:1.148
--- phpdoc/Makefile.in:1.147Wed Jan 28 11:10:24 2004
+++ phpdoc/Makefile.in Sat Apr 17 12:10:02 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.147 2004/01/28 16:10:24 nlopess Exp $
+# $Id: Makefile.in,v 1.148 2004/04/17 16:10:02 kennyt Exp $
#
all: html
@@ -316,3 +316,9 @@
for file in `find . -name "*.in"`; do rm `dirname $$file`/`basename $$file
.in`; done
# }}}
+# {{{ tree utils
+
+pull:
+ cvs -z3 up -dP $(LANGDIR)
+
+# }}}
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Sat Jan 3 07:32:15 2004 EDT Modified files: /phpdoc Makefile.in Log: fixed funcindex.xml generation Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.145 phpdoc/Makefile.in:1.146 --- phpdoc/Makefile.in:1.145Sat Jan 3 06:52:22 2004 +++ phpdoc/Makefile.in Sat Jan 3 07:32:15 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.145 2004/01/03 11:52:22 nlopess Exp $ +# $Id: Makefile.in,v 1.146 2004/01/03 12:32:15 nlopess Exp $ # all: html @@ -114,15 +114,17 @@ revcheck.html: FORCE PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php $(LANGDIR) > revcheck.html -funcindex.xml: quickref.txt +funcindex.xml: FORCE @if test "$(PHP)" = "no"; then \ echo "WARNING: recreating the function index needs php" ;\ echo " which was not found by configure" ;\ echo " reusing old file" ;\ touch funcindex.xml ;\ else \ - echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php $(srcdir)/quickref.txt > funcindex.xml" ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php $(srcdir)/quickref.txt > funcindex.xml ;\ + $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e 's/ */ /g' | sort -f > quickref-temp.txt ;\ + echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\ + $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml ;\ + rm -f quickref-temp.txt ;\ fi mirror-files: $(MIRROR_TARGETS)
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Sat Jan 3 06:52:22 2004 EDT Modified files: /phpdoc Makefile.in Log: fixed make of quickref.txt Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.144 phpdoc/Makefile.in:1.145 --- phpdoc/Makefile.in:1.144Fri Jan 2 15:24:23 2004 +++ phpdoc/Makefile.in Sat Jan 3 06:52:22 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.144 2004/01/02 20:24:23 nlopess Exp $ +# $Id: Makefile.in,v 1.145 2004/01/03 11:52:22 nlopess Exp $ # all: html @@ -143,7 +143,7 @@ quickref: quickref.txt 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 + $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e 's/ */ /g' | sed -e 's/>/>/' | sort -f > quickref.txt kdevelop_toc: php.toc php.toc: manual.xml $(KDEVELOP_TOC_DEPS)
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Fri Jan 2 15:24:23 2004 EDT Modified files: /phpdoc Makefile.in Log: relative path Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.143 phpdoc/Makefile.in:1.144 --- phpdoc/Makefile.in:1.143Fri Jan 2 12:33:36 2004 +++ phpdoc/Makefile.in Fri Jan 2 15:24:23 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.143 2004/01/02 17:33:36 nlopess Exp $ +# $Id: Makefile.in,v 1.144 2004/01/02 20:24:23 nlopess Exp $ # all: html @@ -121,8 +121,8 @@ echo " reusing old file" ;\ touch funcindex.xml ;\ else \ - echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml" ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml ;\ + echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php $(srcdir)/quickref.txt > funcindex.xml" ;\ + $(PHP) -q $(srcdir)/scripts/genfuncindex.php $(srcdir)/quickref.txt > funcindex.xml ;\ fi mirror-files: $(MIRROR_TARGETS)
Re: [PHP-DOC] cvs: phpdoc / Makefile.in
fixed funcindex.xml generation - echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > funcindex.xml" ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > funcindex.xml ;\ + echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml" ;\ + $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml ;\ fi Relative path computation depends on whether you use CLI or CGI. It would be good to pass $(srcdir)/quicref.txt as a parameter, so the proper path would be used, from anywhere you run the make target... Goba
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Fri Jan 2 12:33:36 2004 EDT Modified files: /phpdoc Makefile.in Log: fixed funcindex.xml generation Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.142 phpdoc/Makefile.in:1.143 --- phpdoc/Makefile.in:1.142Wed Dec 31 20:17:53 2003 +++ phpdoc/Makefile.in Fri Jan 2 12:33:36 2004 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.142 2004/01/01 01:17:53 goba Exp $ +# $Id: Makefile.in,v 1.143 2004/01/02 17:33:36 nlopess Exp $ # all: html @@ -121,8 +121,8 @@ echo " reusing old file" ;\ touch funcindex.xml ;\ else \ - echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > funcindex.xml" ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > funcindex.xml ;\ + echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml" ;\ + $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref.txt > funcindex.xml ;\ fi mirror-files: $(MIRROR_TARGETS)
[PHP-DOC] cvs: phpdoc / Makefile.in
nlopess Wed Dec 24 12:56:05 2003 EDT Modified files: /phpdoc Makefile.in Log: licence version 3.0 Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.140 phpdoc/Makefile.in:1.141 --- phpdoc/Makefile.in:1.140Thu Dec 11 04:14:57 2003 +++ phpdoc/Makefile.in Wed Dec 24 12:56:05 2003 @@ -1,19 +1,22 @@ # +--+ -# | Copyright (c) 1997-2002 The PHP Group| +# | PHP Version 4| # +--+ -# | This source file is subject to version 2.02 of the PHP license, | -# | that is bundled with this package in the file LICENSE and is | -# | available online at http://www.php.net/license/2_02.txt. | +# | Copyright (c) 1997-2003 The PHP Group| +# +--+ +# | This source file is subject to version 3.0 of the PHP license, | +# | that is bundled with this package in the file LICENSE, and is| +# | available through the world-wide-web at the following url: | +# | http://www.php.net/license/3_0.txt. | # | If you did not receive a copy of the PHP license and are unable to | -# | obtain it online, please send a note to [EMAIL PROTECTED] so we can| -# | mail you a copy. | +# | obtain it through the world-wide-web, please send a note to | +# | [EMAIL PROTECTED] so we can mail you a copy immediately. | # +--+ # | Authors: Stig Bakken <[EMAIL PROTECTED]> | # +--+ # # -# $Id: Makefile.in,v 1.140 2003/12/11 09:14:57 vrana Exp $ +# $Id: Makefile.in,v 1.141 2003/12/24 17:56:05 nlopess Exp $ # all: html
[PHP-DOC] cvs: phpdoc / Makefile.in /scripts html_syntax.php
vrana Thu Dec 11 04:14:57 2003 EDT
Modified files:
/phpdoc/scripts html_syntax.php
/phpdoc Makefile.in
Log:
Syntax highlight examples
Index: phpdoc/scripts/html_syntax.php
diff -u phpdoc/scripts/html_syntax.php:1.2 phpdoc/scripts/html_syntax.php:1.3
--- phpdoc/scripts/html_syntax.php:1.2 Wed Dec 10 16:30:03 2003
+++ phpdoc/scripts/html_syntax.php Thu Dec 11 04:14:56 2003
@@ -1,12 +1,16 @@
#!/usr/bin/php -q
+*/
if ($_SERVER["argc"] < 3) {
exit("Purpose: Syntax highlight PHP examples in DSSSL generated HTML manual.\n"
.'Usage: html_syntax.php [ "html" | "php" ] [ filename.ext | dir |
wildcard ] ...' ."\n"
- .'"html" - highlight_string() is used, "php" - highlight_php() is
called' ."\n"
+ .'"html" - highlight_string() is applied, "php" - highlight_php() is
added' ."\n"
);
}
-set_time_limit(60*60); // can run long, but not more than 1 hour
+set_time_limit(5*60); // can run long, but not more than 5 minutes
function callback_html_number_entities_decode($matches) {
return chr($matches[1]);
@@ -28,19 +32,23 @@
if (is_file($file)) {
$process = array($file);
} elseif (is_dir($file)) {
- $process = glob(realpath($file) ."/*"); // realpath only for stripping
slash from the end
+ $lastchar = substr($file, -1);
+ $process = glob($file . ($lastchar == "/" || $lastchar == "\\" ? "*" :
"/*"));
} else { // should be wildcard
$process = glob($file);
}
- foreach ($process as $val) {
-echo "$val\n";
- $original = file_get_contents($val);
+ foreach ($process as $filename) {
+ if (!is_file($filename)) { // do not recurse
+ continue;
+ }
+ //~ echo "$filename\n";
+ $original = file_get_contents($filename);
$highlighted =
preg_replace_callback("!(.*)!sU",
"callback_highlight_php", $original);
if ($original != $highlighted) {
-// file_put_contents is in PHP >= 5
-$fp = fopen($val, "wb");
-fwrite($fp, $highlighted);
-fclose($fp);
+ // file_put_contents is only in PHP >= 5
+ $fp = fopen($filename, "wb");
+ fwrite($fp, $highlighted);
+ fclose($fp);
}
}
}
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.139 phpdoc/Makefile.in:1.140
--- phpdoc/Makefile.in:1.139Sun Oct 12 08:11:36 2003
+++ phpdoc/Makefile.in Thu Dec 11 04:14:57 2003
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.139 2003/10/12 12:11:36 goba Exp $
+# $Id: Makefile.in,v 1.140 2003/12/11 09:14:57 vrana Exp $
#
all: html
@@ -163,6 +163,7 @@
@test -d html || mkdir 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/
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(HACK_RTL_LANGS_PAGES)
@@ -191,6 +192,7 @@
@test -d 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) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` remove
$(HACK_RTL_LANGS_PHPWEB)
[PHP-DOC] cvs: phpdoc / Makefile.in
gobaSun Oct 12 08:11:36 2003 EDT Modified files: /phpdoc Makefile.in Log: Use DSSSL sheets, not XSL ones for now Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.138 phpdoc/Makefile.in:1.139 --- phpdoc/Makefile.in:1.138Tue Jul 22 14:30:41 2003 +++ phpdoc/Makefile.in Sun Oct 12 08:11:36 2003 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.138 2003/07/22 18:30:41 momo Exp $ +# $Id: Makefile.in,v 1.139 2003/10/12 12:11:36 goba Exp $ # all: html @@ -55,8 +55,8 @@ KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile [EMAIL PROTECTED]@.tar.bz2 @[EMAIL PROTECTED] @[EMAIL PROTECTED] -#MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES) -MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES) +MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES) +#MIRROR_TARGETS=phpweb_xsl html/index.html $(DIST_FILES) [EMAIL PROTECTED]@.pdf.bz2
[PHP-DOC] cvs: phpdoc / Makefile.in
momoTue Jul 22 14:30:41 2003 EDT Modified files: /phpdoc Makefile.in Log: typo Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.137 phpdoc/Makefile.in:1.138 --- phpdoc/Makefile.in:1.137Tue Jul 22 01:09:21 2003 +++ phpdoc/Makefile.in Tue Jul 22 14:30:41 2003 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.137 2003/07/22 05:09:21 momo Exp $ +# $Id: Makefile.in,v 1.138 2003/07/22 18:30:41 momo Exp $ # all: html @@ -191,7 +191,7 @@ @test -d 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)/rtlpatch/hackmanuallang.php he + $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en $(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` remove $(HACK_RTL_LANGS_PHPWEB) -- PHP Documentation Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in /dsssl/docbook/common dbl1he.ent /scripts/rtlpatch hackmanuallang.php
momoTue Jul 22 01:09:22 2003 EDT
Added files:
/phpdoc/scripts/rtlpatchhackmanuallang.php
Modified files:
/phpdoc Makefile.in
/phpdoc/dsssl/docbook/commondbl1he.ent
Log:
bypassing dsssl to use hebrew entities
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.136 phpdoc/Makefile.in:1.137
--- phpdoc/Makefile.in:1.136Fri Jun 27 18:55:49 2003
+++ phpdoc/Makefile.in Tue Jul 22 01:09:21 2003
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.136 2003/06/27 22:55:49 tom Exp $
+# $Id: Makefile.in,v 1.137 2003/07/22 05:09:21 momo Exp $
#
all: html
@@ -161,7 +161,9 @@
html/index.html: manual.xml $(HTML_DEPS)
@test -d html || mkdir 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)/rtlpatch/hackmanuallang.php en
$(HACK_RTL_LANGS_PAGES)
# still needs more tweaks!!
@@ -187,7 +189,9 @@
php/index.php: manual.xml $(PHPWEB_DEPS)
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
@test -d 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)/rtlpatch/hackmanuallang.php he
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` remove
$(HACK_RTL_LANGS_PHPWEB)
Index: phpdoc/dsssl/docbook/common/dbl1he.ent
diff -u phpdoc/dsssl/docbook/common/dbl1he.ent:1.1
phpdoc/dsssl/docbook/common/dbl1he.ent:1.2
--- phpdoc/dsssl/docbook/common/dbl1he.ent:1.1 Sat Jul 20 07:07:54 2002
+++ phpdoc/dsssl/docbook/common/dbl1he.ent Tue Jul 22 01:09:22 2003
@@ -1,157 +1,157 @@
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: phpdoc/scripts/rtlpatch/hackmanuallang.php
+++ phpdoc/scripts/rtlpatch/hackmanuallang.php
http://www.php.net/license/2_02.txt. |
| If uou did not receive a copy of the PHP license and are unable to |
| obtain it through the world wide web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately|
+--+
| Authors:Moshe Doron <[EMAIL PROTECTED]> |
+--+
$Id: hackmanuallang.php,v 1.1 2003/07/22 05:09:22 momo Exp $
*/
/*
REQUIRES: PHP 4.3.0 CLI or higher
This file is patch allow per language customize for not pulling the autobuild
system all those condition
i making use this file to bypass some jade mysteries on the hebrew manual
impossible build proccess
this script have to be run befor the build proccess.
giving the docs path it's edit the files and add dir=rtl,ltr where needed
Usage: php scriptname lang-code
*/
error_reporting(2047);
// finding the real path of the needed files:
$mypath = $_SERVER["SCRIPT_NAME"];
$spos = strrpos($mypath,"/");
if(!$spos) $spos = strrpos($mypath,"\\");
$mypath = substr($mypath,0,$spos);
if($mypath) $mypath.="/";
$lang= $argv[1];
if($lang=="he"){
//replace the english dsssl entities here:
if(file_exists("$mypath../../dsssl/docbook/common/dbl1en.ent")){
my_shell("mv $mypath../../dsssl/docbook/common/dbl1en.ent
$mypath../../dsssl/docbook/common/dbl1en.ent.org");
my_shell("cp $mypath../../dsssl/docbook/common/dbl1he.ent
$mypath../../dsssl/docbook/common/dbl1en.ent");
}
}else{
/*
this section used:
1. after the hebrew build:
2. each start of non-hebrew build to cover the situation where the hebrew
build was halted and case 1 not arrived.
*/
if(file_exists("$mypath../../dsssl/docbook/common/dbl1en.ent.org")){
my_shell("mv $mypath../../dsssl/docbook/common/dbl1en.ent.org
$mypath../../dsssl/docbook/common/dbl1en.ent");
}
}
function my_shell($cmd){
//echo "shell $cmd\n";
$shell = shell_exec($cmd);
//echo $shell;
}
?>
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in
tom Fri Jun 27 18:55:49 2003 EDT
Modified files:
/phpdoc Makefile.in
Log:
copy figures for pdf and bightml
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.135 phpdoc/Makefile.in:1.136
--- phpdoc/Makefile.in:1.135Mon May 26 06:41:37 2003
+++ phpdoc/Makefile.in Fri Jun 27 18:55:49 2003
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.135 2003/05/26 10:41:37 momo Exp $
+# $Id: Makefile.in,v 1.136 2003/06/27 22:55:49 tom Exp $
#
all: html
@@ -169,10 +169,10 @@
@test -d html || mkdir html
${XSLTPROC} xsl/html.xsl manual.xml
-bightml_xsl: manual.xml
+bightml_xsl: manual.xml zendapi
${XSLTPROC} -o @[EMAIL PROTECTED] xsl/bightml.xsl manual.xml
-fo: manual.xml
+fo: manual.xml zendapi
${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
chm_xsl: manual.xml
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in
tom Sun Mar 9 12:38:54 2003 EDT
Modified files:
/phpdoc Makefile.in
Log:
added targets for bightml and fo
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.125 phpdoc/Makefile.in:1.126
--- phpdoc/Makefile.in:1.125Mon Feb 10 08:12:28 2003
+++ phpdoc/Makefile.in Sun Mar 9 12:38:54 2003
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.125 2003/02/10 13:12:28 betz Exp $
+# $Id: Makefile.in,v 1.126 2003/03/09 17:38:54 tom Exp $
#
all: html
@@ -45,7 +45,6 @@
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
@@ -163,7 +162,13 @@
# still needs more tweaks!!
html_xsl: manual.xml
@test -d html || mkdir html
- ${XSLTPROC} $(HTML_XSL_SHEET) manual.xml
+ ${XSLTPROC} xsl/html.xsl manual.xml
+
+bightml_xsl: manual.xml
+ ${XSLTPROC} -o @[EMAIL PROTECTED] xsl/bightml.xsl manual.xml
+
+fo: manual.xml
+ ${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
chm_xsl: manual.xml
@test -d ./htmlhelp/html || mkdir ./htmlhelp/html
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in
betzMon Feb 10 08:12:28 2003 EDT Modified files: /phpdoc Makefile.in Log: xmllint introduced, additional test target test_xml through xmllint Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.124 phpdoc/Makefile.in:1.125 --- phpdoc/Makefile.in:1.124Sat Feb 1 10:39:25 2003 +++ phpdoc/Makefile.in Mon Feb 10 08:12:28 2003 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.124 2003/02/01 15:39:25 betz Exp $ +# $Id: Makefile.in,v 1.125 2003/02/10 13:12:28 betz Exp $ # all: html @@ -32,6 +32,7 @@ NSGMLS=@SP_OPTIONS@ @NSGMLS@ PHP=@PHP@ XSLTPROC=@XSLTPROC@ +XMLLINT=@XMLLINT@ CATALOG=@CATALOG@ @@ -261,6 +262,12 @@ @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 + +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 entities/missing-ids.xml; then touch entities/missing-ids.xml; +fi + $(XMLLINT) --noent --noout --valid manual.xml # }}} -- PHP Documentation Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in
betzSat Feb 1 10:39:26 2003 EDT Modified files: /phpdoc Makefile.in Log: exclude pdf-files from build process Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.123 phpdoc/Makefile.in:1.124 --- phpdoc/Makefile.in:1.123Sat Aug 3 12:11:16 2002 +++ phpdoc/Makefile.in Sat Feb 1 10:39:25 2003 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.123 2002/08/03 16:11:16 goba Exp $ +# $Id: Makefile.in,v 1.124 2003/02/01 15:39:25 betz Exp $ # all: html @@ -119,7 +119,8 @@ fi mirror-files: $(MIRROR_TARGETS) -extra-mirror-files: $(PDF_FILES) isilo +#extra-mirror-files: $(PDF_FILES) isilo +extra-mirror-files: isilo snapshot: manual-snapshot.tar.gz -- 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
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
gobaSat Jul 27 09:43:12 2002 EDT Modified files: /phpdoc Makefile.in Log: Correcting funcindex generation code to work with cygwin+windows+php Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.121 phpdoc/Makefile.in:1.122 --- phpdoc/Makefile.in:1.121Thu Jul 25 07:01:04 2002 +++ phpdoc/Makefile.in Sat Jul 27 09:43:12 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.121 2002/07/25 11:01:04 goba Exp $ +# $Id: Makefile.in,v 1.122 2002/07/27 13:43:12 goba Exp $ # all: html @@ -110,8 +110,8 @@ echo " reusing old file" ;\ touch funcindex.xml ;\ else \ - 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 ;\ + echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > +funcindex.xml" ;\ + $(PHP) -q $(srcdir)/scripts/genfuncindex.php ../quickref.txt > funcindex.xml ;\ fi mirror-files: $(MIRROR_TARGETS) @@ -130,7 +130,7 @@ quickref: quickref.txt quickref.txt: FORCE - if test ! -e funcindex.xml; then touch funcindex.xml; fi + @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 kdevelop_toc: php.toc -- PHP Documentation Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
gobaThu Jul 25 07:01:05 2002 EDT Modified files: /phpdoc manual.xml.in Makefile.in Log: We use DocBook 4.1.2 and not anything else => this also enables the editing of manual.xml.in with catalog supporting editors. Index: phpdoc/manual.xml.in diff -u phpdoc/manual.xml.in:1.127 phpdoc/manual.xml.in:1.128 --- phpdoc/manual.xml.in:1.127 Wed Jul 24 15:17:53 2002 +++ phpdoc/manual.xml.inThu Jul 25 07:01:04 2002 @@ -1,6 +1,6 @@ - Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.120 phpdoc/Makefile.in:1.121 --- phpdoc/Makefile.in:1.120Thu Jul 18 07:29:15 2002 +++ phpdoc/Makefile.in Thu Jul 25 07:01:04 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.120 2002/07/18 11:29:15 goba Exp $ +# $Id: Makefile.in,v 1.121 2002/07/25 11:01:04 goba Exp $ # all: html @@ -41,7 +41,7 @@ PRINT_STYLESHEET=dsssl/print.dsl QUICKREF_STYLESHEET=dsssl/quickref.dsl KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl -XMLDCL=$(srcdir)/dtds/dbxml-@DOCBOOK_VERSION@/phpdocxml.dcl +XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl 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 -- PHP Documentation Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-DOC] cvs: phpdoc / Makefile.in
gobaThu Jul 18 07:29:16 2002 EDT Modified files: /phpdoc Makefile.in Log: Correcting revcheck make code Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.119 phpdoc/Makefile.in:1.120 --- phpdoc/Makefile.in:1.119Tue Jun 11 06:52:30 2002 +++ phpdoc/Makefile.in Thu Jul 18 07:29:15 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.119 2002/06/11 10:52:30 hholzgra Exp $ +# $Id: Makefile.in,v 1.120 2002/07/18 11:29:15 goba Exp $ # all: html @@ -26,6 +26,7 @@ scriptdir=@srcdir@/scripts PHP_SOURCE=@PHP_SOURCE@ LANGCODE=@LANG@ +LANGDIR=@LANGDIR@ LANG=@LANG@ -D . JADE=@SP_OPTIONS@ @JADE@ -D . -wno-idref NSGMLS=@SP_OPTIONS@ @NSGMLS@ @@ -100,7 +101,7 @@ $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt revcheck.html: FORCE - PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php $(LANGCODE) > revcheck.html + PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php +$(LANGDIR) > revcheck.html funcindex.xml: quickref.txt @if test "$(PHP)" = "no"; then \ -- 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
tom Fri May 31 17:05:30 2002 EDT Modified files: /phpdoc Makefile.in Log: implemented phpdoc-vers. of php.ini for revcheck Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.117 phpdoc/Makefile.in:1.118 --- phpdoc/Makefile.in:1.117Sat May 25 13:03:46 2002 +++ phpdoc/Makefile.in Fri May 31 17:05:28 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.117 2002/05/25 17:03:46 jimw Exp $ +# $Id: Makefile.in,v 1.118 2002/05/31 21:05:28 tom Exp $ # all: html @@ -100,7 +100,7 @@ $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt revcheck.html: FORCE - PHPDOCDIR=$(srcdir) $(PHP) -f $(scriptdir)/revcheck.php $(LANGCODE) > revcheck.html + PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php +$(LANGCODE) > revcheck.html funcindex.xml: quickref.txt @if test "$(PHP)" = "no"; then \
[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
On Mon, 20 May 2002, Thomas Schöfbeck wrote: > Hi Derick, > > it works. The error you wrote occurs, because you haven't run > autoconf (!) I did run that, but I forgot to update configure.in =) It works fine now, > To the "bogus" things: > > As I wrote in my initial personal mail, do I don't know the exact > environment on the server (script that calls "make", etc..). > I just try to fix bugs, like the missing imgages (was somewhat like Bug > 16832, can't check it, since bugs.php.net is down), and they were > missing. (and they are still missing in chm's and compressed distributions) > > It's fine if somebody has fixed that externally at the server, but I > can't see that on one hand (except now the result), and the links on > local builds are still broken on the other hand (figures/ instead of > ../figures to make the story short: it's inconsisitent). > > Even this patches would work at least also on local builds (no broken > links), I'll revert it if you want (since it's at least working on the > server now :), but I think we should work together on a consistent > solution, so that the builds can be done also locally (including chm and > compressed files). Yup, I"m going to get this to work in the CHMs today, but I can not say a lot about the server builds... Derick > [EMAIL PROTECTED] wrote: > > On Sun, 19 May 2002, Thomas Schoefbeck wrote: > > > > > >>tom Sun May 19 14:31:38 2002 EDT > >> > >> Modified files: > >>/phpdoc Makefile.in > >> Log: > >> this should now work also without ZendAPI > > > > > > I now get this error: > > > > [root@saturnus phpdoc]# make html > > make: ZEND_FIGURES_HTML@: Command not found > > make: *** [zendapihtml] Error 127 > > > > And the Makefile has still this bogus things: > > > > zendapihtml: > > @test -d html || mkdir html > > @ZEND_FIGURES_HTML@ > > > > zendapiphp: > > @test -d php || mkdir php > > @ZEND_FIGURES_PHP@ > > > > > > > > regards, > > Derick > > > > > > > >> > >>Index: phpdoc/Makefile.in > >>diff -u phpdoc/Makefile.in:1.115 phpdoc/Makefile.in:1.116 > >>--- phpdoc/Makefile.in:1.115Sun May 19 08:08:33 2002 > >>+++ phpdoc/Makefile.in Sun May 19 14:31:38 2002 > >>@@ -13,7 +13,7 @@ > >> # > >> > >> # > >>-# $Id: Makefile.in,v 1.115 2002/05/19 12:08:33 derick Exp $ > >>+# $Id: Makefile.in,v 1.116 2002/05/19 18:31:38 tom Exp $ > >> # > >> > >> all: html > >>@@ -42,10 +42,11 @@ > >> 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 > >>+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 > >> 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 > >>+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp > >> KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile > >> > >> DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb > >>@@ -69,6 +70,14 @@ > >> zendapi: > >>@ZEND_FIGURES@ > >> > >>+zendapihtml: > >>+ @test -d html || mkdir html > >>+ @ZEND_FIGURES_HTML@ > >>+ > >>+zendapiphp: > >>+ @test -d php || mkdir php > >>+ @ZEND_FIGURES_PHP@ > >>+ > >> html: html/index.html > >> bightml: @MANUAL@.html > >> phpweb: php/index.php > >>@@ -138,7 +147,7 @@ > >> @MANUAL@.xml: manual.xml > >>cp manual.xml $@ > >> > >>-@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) > >>+@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) > >> > >> html/index.html: manual.xml $(HTML_DEPS) > >>@test -d html || mkdir html > >> > >> > > > > > > --- > > Did I help you? http://www.jdimedia.nl/derick/link.php?url=giftlist > > Frequent ranting: http://www.jdimedia.nl/derick/ > > --- > > PHP: Scripting the Web - [EMAIL PROTECTED] > > All your branches are belong to me! > > SRM: Script Running Machine - www.vl-srm.net > > --- > > > > > --- Did I help you? http://www.jdimedia.nl/derick/link.php?url=giftlist Frequent ranting: http://www.jdimedia.nl/derick/ --- PHP: Scripting the Web - [EMAIL PROTECTED] All your branches are belong to me!
Re: [PHP-DOC] cvs: phpdoc / Makefile.in
Hi Derick, it works. The error you wrote occurs, because you haven't run autoconf (!) ./configure with the new Configure.in To the "bogus" things: As I wrote in my initial personal mail, do I don't know the exact environment on the server (script that calls "make", etc..). I just try to fix bugs, like the missing imgages (was somewhat like Bug 16832, can't check it, since bugs.php.net is down), and they were missing. (and they are still missing in chm's and compressed distributions) It's fine if somebody has fixed that externally at the server, but I can't see that on one hand (except now the result), and the links on local builds are still broken on the other hand (figures/ instead of ../figures to make the story short: it's inconsisitent). Even this patches would work at least also on local builds (no broken links), I'll revert it if you want (since it's at least working on the server now :), but I think we should work together on a consistent solution, so that the builds can be done also locally (including chm and compressed files). Best regards, Thomas [EMAIL PROTECTED] wrote: > On Sun, 19 May 2002, Thomas Schoefbeck wrote: > > >>tom Sun May 19 14:31:38 2002 EDT >> >> Modified files: >>/phpdoc Makefile.in >> Log: >> this should now work also without ZendAPI > > > I now get this error: > > [root@saturnus phpdoc]# make html > make: ZEND_FIGURES_HTML@: Command not found > make: *** [zendapihtml] Error 127 > > And the Makefile has still this bogus things: > > zendapihtml: > @test -d html || mkdir html > @ZEND_FIGURES_HTML@ > > zendapiphp: > @test -d php || mkdir php > @ZEND_FIGURES_PHP@ > > > > regards, > Derick > > > >> >>Index: phpdoc/Makefile.in >>diff -u phpdoc/Makefile.in:1.115 phpdoc/Makefile.in:1.116 >>--- phpdoc/Makefile.in:1.115 Sun May 19 08:08:33 2002 >>+++ phpdoc/Makefile.inSun May 19 14:31:38 2002 >>@@ -13,7 +13,7 @@ >> # >> >> # >>-# $Id: Makefile.in,v 1.115 2002/05/19 12:08:33 derick Exp $ >>+# $Id: Makefile.in,v 1.116 2002/05/19 18:31:38 tom Exp $ >> # >> >> all: html >>@@ -42,10 +42,11 @@ >> 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 >>+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 >> 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 >>+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp >> KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile >> >> DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb >>@@ -69,6 +70,14 @@ >> zendapi: >> @ZEND_FIGURES@ >> >>+zendapihtml: >>+ @test -d html || mkdir html >>+ @ZEND_FIGURES_HTML@ >>+ >>+zendapiphp: >>+ @test -d php || mkdir php >>+ @ZEND_FIGURES_PHP@ >>+ >> html: html/index.html >> bightml: @MANUAL@.html >> phpweb: php/index.php >>@@ -138,7 +147,7 @@ >> @MANUAL@.xml: manual.xml >> cp manual.xml $@ >> >>-@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) >>+@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) >> >> html/index.html: manual.xml $(HTML_DEPS) >> @test -d html || mkdir html >> >> > > > --- > Did I help you? http://www.jdimedia.nl/derick/link.php?url=giftlist > Frequent ranting: http://www.jdimedia.nl/derick/ > --- > PHP: Scripting the Web - [EMAIL PROTECTED] > All your branches are belong to me! > SRM: Script Running Machine - www.vl-srm.net > --- > >
Re: [PHP-DOC] cvs: phpdoc / Makefile.in
On Sun, 19 May 2002, Thomas Schoefbeck wrote: > tom Sun May 19 14:31:38 2002 EDT > > Modified files: > /phpdoc Makefile.in > Log: > this should now work also without ZendAPI I now get this error: [root@saturnus phpdoc]# make html make: ZEND_FIGURES_HTML@: Command not found make: *** [zendapihtml] Error 127 And the Makefile has still this bogus things: zendapihtml: @test -d html || mkdir html @ZEND_FIGURES_HTML@ zendapiphp: @test -d php || mkdir php @ZEND_FIGURES_PHP@ regards, Derick > > Index: phpdoc/Makefile.in > diff -u phpdoc/Makefile.in:1.115 phpdoc/Makefile.in:1.116 > --- phpdoc/Makefile.in:1.115 Sun May 19 08:08:33 2002 > +++ phpdoc/Makefile.inSun May 19 14:31:38 2002 > @@ -13,7 +13,7 @@ > # > > # > -# $Id: Makefile.in,v 1.115 2002/05/19 12:08:33 derick Exp $ > +# $Id: Makefile.in,v 1.116 2002/05/19 18:31:38 tom Exp $ > # > > all: html > @@ -42,10 +42,11 @@ > 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 > +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 > 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 > +PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp > KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile > > DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb > @@ -69,6 +70,14 @@ > zendapi: > @ZEND_FIGURES@ > > +zendapihtml: > + @test -d html || mkdir html > + @ZEND_FIGURES_HTML@ > + > +zendapiphp: > + @test -d php || mkdir php > + @ZEND_FIGURES_PHP@ > + > html: html/index.html > bightml: @MANUAL@.html > phpweb: php/index.php > @@ -138,7 +147,7 @@ > @MANUAL@.xml: manual.xml > cp manual.xml $@ > > -@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) > +@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) > > html/index.html: manual.xml $(HTML_DEPS) > @test -d html || mkdir html > > --- Did I help you? http://www.jdimedia.nl/derick/link.php?url=giftlist Frequent ranting: http://www.jdimedia.nl/derick/ --- PHP: Scripting the Web - [EMAIL PROTECTED] All your branches are belong to me! SRM: Script Running Machine - www.vl-srm.net ---
[PHP-DOC] cvs: phpdoc / Makefile.in
tom Sun May 19 14:31:38 2002 EDT Modified files: /phpdoc Makefile.in Log: this should now work also without ZendAPI Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.115 phpdoc/Makefile.in:1.116 --- phpdoc/Makefile.in:1.115Sun May 19 08:08:33 2002 +++ phpdoc/Makefile.in Sun May 19 14:31:38 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.115 2002/05/19 12:08:33 derick Exp $ +# $Id: Makefile.in,v 1.116 2002/05/19 18:31:38 tom Exp $ # all: html @@ -42,10 +42,11 @@ 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 +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 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 +PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb @@ -69,6 +70,14 @@ zendapi: @ZEND_FIGURES@ +zendapihtml: + @test -d html || mkdir html + @ZEND_FIGURES_HTML@ + +zendapiphp: + @test -d php || mkdir php + @ZEND_FIGURES_PHP@ + html: html/index.html bightml: @MANUAL@.html phpweb: php/index.php @@ -138,7 +147,7 @@ @MANUAL@.xml: manual.xml cp manual.xml $@ -@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) +@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) html/index.html: manual.xml $(HTML_DEPS) @test -d html || mkdir html
[PHP-DOC] cvs: phpdoc / Makefile.in
derick Sun May 19 08:08:34 2002 EDT Modified files: /phpdoc Makefile.in Log: - Revert broken patch Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.114 phpdoc/Makefile.in:1.115 --- phpdoc/Makefile.in:1.114Sat May 18 13:45:24 2002 +++ phpdoc/Makefile.in Sun May 19 08:08:33 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.114 2002/05/18 17:45:24 tom Exp $ +# $Id: Makefile.in,v 1.115 2002/05/19 12:08:33 derick Exp $ # all: html @@ -33,7 +33,7 @@ CATALOG=@CATALOG@ -VERSION="@PHPVERSION@" +VERSION="@PHP_VERSION@" HTML_STYLESHEET=dsssl/html.dsl PHPWEB_STYLESHEET=dsssl/phpweb.dsl HOWTO_STYLESHEET=dsssl/howto.dsl @@ -42,11 +42,10 @@ KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl XMLDCL=$(srcdir)/dtds/dbxml-@DOCBOOK_VERSION@/phpdocxml.dcl -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 +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 zendapiphp +PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapi KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb @@ -70,14 +69,6 @@ zendapi: @ZEND_FIGURES@ -zendapihtml: - @test -d html || mkdir html - @ZEND_FIGURES@/html - -zendapiphp: - @test -d php || mkdir php - @ZEND_FIGURES@/php - html: html/index.html bightml: @MANUAL@.html phpweb: php/index.php @@ -147,7 +138,7 @@ @MANUAL@.xml: manual.xml cp manual.xml $@ -@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) +@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) html/index.html: manual.xml $(HTML_DEPS) @test -d html || mkdir html @@ -167,13 +158,13 @@ iSilo386 @MANUAL@.html @MANUAL@.isilo.pdb @MANUAL@.zip: html/index.html - -rm -f $@ && (cd html; zip -9 -q ../$@ *.html figures/*) + -rm -f $@ && (cd html; zip -9 -q ../$@ *.html) @MANUAL@.tar.gz: html/index.html - -rm -f $@ && (cd html; tar -cf - *.html figures) | gzip -9 > $@ + -rm -f $@ && (cd html; tar -cf - *.html) | gzip -9 > $@ @MANUAL@.tar.bz2: html/index.html - -rm -f $@ && (cd html; tar -cf - *.html figures) | bzip2 -9 > $@ + -rm -f $@ && (cd html; tar -cf - *.html) | bzip2 -9 > $@ howto/html/index.html: howto/howto.xml $(HOWTO_DEPS) @test -d howto/html || mkdir howto/html
Re: [PHP-DOC] cvs: phpdoc / Makefile.in
This breaks the build for me with: [root@saturnus phpdoc]# make html /html make: /html: Command not found make: *** [zendapihtml] Error 127 And this is because the Makefile shows: zendapihtml: @test -d html || mkdir html /html zendapiphp: @test -d php || mkdir php /php regards, Derick On Sat, 18 May 2002, Thomas Schoefbeck wrote: > tom Sat May 18 13:45:37 2002 EDT > > Modified files: > /phpdoc Makefile.in > Log: > quick&dirty-implementation of images into the manual > > Index: phpdoc/Makefile.in > diff -u phpdoc/Makefile.in:1.113 phpdoc/Makefile.in:1.114 > --- phpdoc/Makefile.in:1.113 Sat Feb 9 18:51:38 2002 > +++ phpdoc/Makefile.inSat May 18 13:45:24 2002 > @@ -13,7 +13,7 @@ > # > > # > -# $Id: Makefile.in,v 1.113 2002/02/09 23:51:38 jimw Exp $ > +# $Id: Makefile.in,v 1.114 2002/05/18 17:45:24 tom Exp $ > # > > all: html > @@ -33,7 +33,7 @@ > > CATALOG=@CATALOG@ > > -VERSION="@PHP_VERSION@" > +VERSION="@PHPVERSION@" > HTML_STYLESHEET=dsssl/html.dsl > PHPWEB_STYLESHEET=dsssl/phpweb.dsl > HOWTO_STYLESHEET=dsssl/howto.dsl > @@ -42,10 +42,11 @@ > 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 > +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 > 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 > +PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp > KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile > > DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb > @@ -69,6 +70,14 @@ > zendapi: > @ZEND_FIGURES@ > > +zendapihtml: > + @test -d html || mkdir html > + @ZEND_FIGURES@/html > + > +zendapiphp: > + @test -d php || mkdir php > + @ZEND_FIGURES@/php > + > html: html/index.html > bightml: @MANUAL@.html > phpweb: php/index.php > @@ -138,7 +147,7 @@ > @MANUAL@.xml: manual.xml > cp manual.xml $@ > > -@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) > +@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) > > html/index.html: manual.xml $(HTML_DEPS) > @test -d html || mkdir html > @@ -158,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 -9 -q ../$@ *.html figures/*) > > @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 > > --- Did I help you? http://www.jdimedia.nl/derick/link.php?url=giftlist Frequent ranting: http://www.jdimedia.nl/derick/ --- PHP: Scripting the Web - [EMAIL PROTECTED] All your branches are belong to me! SRM: Script Running Machine - www.vl-srm.net ---
[PHP-DOC] cvs: phpdoc / Makefile.in
tom Sat May 18 13:45:37 2002 EDT Modified files: /phpdoc Makefile.in Log: quick&dirty-implementation of images into the manual Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.113 phpdoc/Makefile.in:1.114 --- phpdoc/Makefile.in:1.113Sat Feb 9 18:51:38 2002 +++ phpdoc/Makefile.in Sat May 18 13:45:24 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.113 2002/02/09 23:51:38 jimw Exp $ +# $Id: Makefile.in,v 1.114 2002/05/18 17:45:24 tom Exp $ # all: html @@ -33,7 +33,7 @@ CATALOG=@CATALOG@ -VERSION="@PHP_VERSION@" +VERSION="@PHPVERSION@" HTML_STYLESHEET=dsssl/html.dsl PHPWEB_STYLESHEET=dsssl/phpweb.dsl HOWTO_STYLESHEET=dsssl/howto.dsl @@ -42,10 +42,11 @@ 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 +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 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 +PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapiphp KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb @@ -69,6 +70,14 @@ zendapi: @ZEND_FIGURES@ +zendapihtml: + @test -d html || mkdir html + @ZEND_FIGURES@/html + +zendapiphp: + @test -d php || mkdir php + @ZEND_FIGURES@/php + html: html/index.html bightml: @MANUAL@.html phpweb: php/index.php @@ -138,7 +147,7 @@ @MANUAL@.xml: manual.xml cp manual.xml $@ -@MANUAL@.html: @MANUAL@.xml $(HTML_DEPS) +@MANUAL@.html: @MANUAL@.xml $(BIGHTML_DEPS) html/index.html: manual.xml $(HTML_DEPS) @test -d html || mkdir html @@ -158,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 -9 -q ../$@ *.html figures/*) @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
[PHP-DOC] cvs: phpdoc / Makefile.in
jimwSat Feb 9 18:51:38 2002 EDT Modified files: /phpdoc Makefile.in Log: add palmdoc and isilo targets, add isilo to extra targets Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.112 phpdoc/Makefile.in:1.113 --- phpdoc/Makefile.in:1.112Sat Feb 9 15:53:01 2002 +++ phpdoc/Makefile.in Sat Feb 9 18:51:38 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.112 2002/02/09 20:53:01 jimw Exp $ +# $Id: Makefile.in,v 1.113 2002/02/09 23:51:38 jimw Exp $ # all: html @@ -105,7 +105,7 @@ fi mirror-files: $(MIRROR_TARGETS) -extra-mirror-files: $(PDF_FILES) +extra-mirror-files: $(PDF_FILES) isilo snapshot: manual-snapshot.tar.gz @@ -148,10 +148,12 @@ @test -d php || mkdir php -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml $(XMLDCL) manual.xml +palmdoc: @MANUAL@.doc.pdb @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 +isilo: @MANUAL@.isilo.pdb @MANUAL@.isilo.pdb: @MANUAL@.html iSilo386 @MANUAL@.html @MANUAL@.isilo.pdb
[PHP-DOC] cvs: phpdoc / Makefile.in
jimwSat Feb 9 15:53:01 2002 EDT Modified files: /phpdoc Makefile.in Log: no more .txt version, either. let people run lynx themselves. Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.111 phpdoc/Makefile.in:1.112 --- phpdoc/Makefile.in:1.111Sat Feb 9 15:37:48 2002 +++ phpdoc/Makefile.in Sat Feb 9 15:53:01 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.111 2002/02/09 20:37:48 jimw Exp $ +# $Id: Makefile.in,v 1.112 2002/02/09 20:53:01 jimw Exp $ # all: html @@ -48,8 +48,7 @@ PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapi KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile -DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.txt.bz2 \ - @MANUAL@.doc.pdb +DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.doc.pdb MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES) PDF_FILES=@MANUAL@.pdf.bz2
[PHP-DOC] cvs: phpdoc / Makefile.in
jimwSat Feb 9 15:37:49 2002 EDT Modified files: /phpdoc Makefile.in Log: we're going .bz2-only from php.net mirrors. Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.110 phpdoc/Makefile.in:1.111 --- phpdoc/Makefile.in:1.110Fri Feb 1 06:13:36 2002 +++ phpdoc/Makefile.in Sat Feb 9 15:37:48 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.110 2002/02/01 11:13:36 hholzgra Exp $ +# $Id: Makefile.in,v 1.111 2002/02/09 20:37:48 jimw Exp $ # all: html @@ -48,11 +48,11 @@ 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 \ - @MANUAL@.html.gz @MANUAL@.txt.gz @MANUAL@.doc.pdb +DIST_FILES=@MANUAL@.tar.bz2 @MANUAL@.html.bz2 @MANUAL@.txt.bz2 \ + @MANUAL@.doc.pdb MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES) -PDF_FILES=@MANUAL@.pdf.gz @MANUAL@.pdf.bz2 @MANUAL@.pdf.zip +PDF_FILES=@MANUAL@.pdf.bz2 # }}}
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
Re: [PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
> do "make entities" before "make test" ;) This produces zero-lenght missing-entities.ent and missing-ids.xml, so (i guess) the appendix tag isn't valid. $ make test if test ! -e funcindex.xml; then touch funcindex.xml; fi /usr/bin/nsgmls -i lang-en -D . -s ./dtds/dbxml-3.1.7/phpdocxml.dcl manual.xml /usr/bin/nsgmls:manual.xml:218:61:E: end tag for "appendix" which is not finished make: *** [test] Error 1 slawek-
Re: [PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
Slawomir Pucia wrote: > Looks like it's still broken. > Btw, shouldn't make clean remove manual.xml? It doesn't. > do "make entities" before "make test" ;)
Re: [PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
Looks like it's still broken. Btw, shouldn't make clean remove manual.xml? It doesn't. make clean autoconf ./configure --with-lang=pl $ make test touch .manual.xml CONFIG_FILES=manual.xml CONFIG_HEADERS= ./config.status creating manual.xml if test ! -e funcindex.xml; then touch funcindex.xml; fi SP_ENCODING=ISO-8859-2 /usr/bin/nsgmls -i lang-pl -D . -s ./dtds/dbxml-3.1.7/phpdocxml.dcl manual.xml /usr/bin/nsgmls:manual.xml:27:0:E: cannot find "entities/missing-entities.ent"; tried "entities/missing-entities.ent", "./entities/missing-entities.ent", "/usr/local/share/sgml/entities/missing-entities.ent", "/usr/local/lib/sgml/entities/missing-entities.ent", "/usr/share/sgml/entities/missing-entities.ent" /usr/bin/nsgmls:manual.xml:218:38:E: cannot find "entities/missing-ids.xml"; tried "entities/missing-ids.xml", "./entities/missing-ids.xml", "/usr/local/share/sgml/entities/missing-ids.xml", "/usr/local/lib/sgml/entities/missing-ids.xml", "/usr/share/sgml/entities/missing-ids.xml" /usr/bin/nsgmls:manual.xml:218:61:E: end tag for "appendix" which is not finished make: *** [test] Error 1
[PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
hholzgraThu Jan 31 16:27:14 2002 EDT Modified files: /phpdoc manual.xml.in Makefile.in Log: quick fix to the quick hack Index: phpdoc/manual.xml.in diff -u phpdoc/manual.xml.in:1.106 phpdoc/manual.xml.in:1.107 --- phpdoc/manual.xml.in:1.106 Thu Jan 31 04:56:18 2002 +++ phpdoc/manual.xml.inThu Jan 31 16:27:14 2002 @@ -215,6 +215,7 @@ &appendices.resources; &appendices.about; &global.function-index; +missing stuff&missing-ids; Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.108 phpdoc/Makefile.in:1.109 --- phpdoc/Makefile.in:1.108Thu Jan 31 05:54:07 2002 +++ phpdoc/Makefile.in Thu Jan 31 16:27:14 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.108 2002/01/31 10:54:07 hholzgra Exp $ +# $Id: Makefile.in,v 1.109 2002/01/31 21:27:14 hholzgra Exp $ # all: html @@ -59,8 +59,8 @@ @AUTOGENERATED_RULES@ entities: FORCE - $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep "not defined" | sed -e's/^.* "//g' > entities/missing-entities.ent - $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep non-existent | sed -e"s/^.* ID //g" > entities/missing-ids.xml + $(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 manual.xml: $(srcdir)/manual.xml.in .manual.xml
[PHP-DOC] cvs: phpdoc / Makefile.in
hholzgraThu Jan 31 05:54:07 2002 EDT Modified files: /phpdoc Makefile.in Log: thinko fix Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.107 phpdoc/Makefile.in:1.108 --- phpdoc/Makefile.in:1.107Thu Jan 31 04:56:18 2002 +++ phpdoc/Makefile.in Thu Jan 31 05:54:07 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.107 2002/01/31 09:56:18 hholzgra Exp $ +# $Id: Makefile.in,v 1.108 2002/01/31 10:54:07 hholzgra Exp $ # all: html @@ -60,7 +60,7 @@ entities: FORCE $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep "not defined" | sed -e's/^.* "//g' > entities/missing-entities.ent - $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep non-existent | sed -e"s/^.* ID //g" > entities/missing-ids.tmp + $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep +non-existent | sed -e"s/^.* ID //g" > +entities/missing-ids.xml manual.xml: $(srcdir)/manual.xml.in .manual.xml
Re: [PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
> + > +%missing-entities; > > + > +]> > + > +entities: FORCE > + $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep "not defined" | sed -e's/^.* "//g' > entities/missing-entities.ent > + $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep non-existent | sed -e"s/^.* ID //g" > entities/missing-ids.tmp I think I can't figure out from the code, that at what point missing-ids.tmp will become missing-ids.xml (as used in entites list). Maybe I found a typo, but I am not sure... Goba
[PHP-DOC] cvs: phpdoc / Makefile.in manual.xml.in
hholzgraThu Jan 31 04:56:18 2002 EDT Modified files: /phpdoc manual.xml.in Makefile.in Log: this is a quick hack that deals with the problem of missing entities and ids for link targets in translations not perfect yet, but at least it doesn't break anything comments or better ideas anyone? Index: phpdoc/manual.xml.in diff -u phpdoc/manual.xml.in:1.105 phpdoc/manual.xml.in:1.106 --- phpdoc/manual.xml.in:1.105 Sat Jan 26 18:11:11 2002 +++ phpdoc/manual.xml.inThu Jan 31 04:56:18 2002 @@ -23,8 +23,12 @@ %global.chapters; %build.version; -]> + +%missing-entities; + +]> + &PHPManual; Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.106 phpdoc/Makefile.in:1.107 --- phpdoc/Makefile.in:1.106Fri Jan 25 04:53:36 2002 +++ phpdoc/Makefile.in Thu Jan 31 04:56:18 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.106 2002/01/25 09:53:36 hholzgra Exp $ +# $Id: Makefile.in,v 1.107 2002/01/31 09:56:18 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 +HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in +dsssl/common.dsl.in zendapi entities 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 @@ -58,6 +58,11 @@ @AUTOGENERATED_RULES@ +entities: FORCE + $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep "not defined" | +sed -e's/^.* "//g' > entities/missing-entities.ent + $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 2>&1 | grep +non-existent | sed -e"s/^.* ID //g" > +entities/missing-ids.tmp + + manual.xml: $(srcdir)/manual.xml.in .manual.xml CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status @@ -224,7 +229,7 @@ # test all possible errors test: manual.xml if test ! -e funcindex.xml; then touch funcindex.xml; fi - $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml + $(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
[PHP-DOC] cvs: phpdoc / Makefile.in
hholzgraFri Jan 25 04:53:37 2002 EDT Modified files: /phpdoc Makefile.in Log: performance tweaks Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.105 phpdoc/Makefile.in:1.106 --- phpdoc/Makefile.in:1.105Sun Jan 20 18:37:04 2002 +++ phpdoc/Makefile.in Fri Jan 25 04:53:36 2002 @@ -13,7 +13,7 @@ # # -# $Id: Makefile.in,v 1.105 2002/01/20 23:37:04 jimw Exp $ +# $Id: Makefile.in,v 1.106 2002/01/25 09:53:36 hholzgra Exp $ # all: html @@ -131,7 +131,8 @@ g++ -o scripts/makedoc $(scriptdir)/makedoc.cc # intermediate file for name change -.INTERMEDIATE: @MANUAL@.xml +.SECONDARY: @MANUAL@.xml + @MANUAL@.xml: manual.xml cp manual.xml $@ @@ -173,7 +174,7 @@ # File endings we are going to define general rules for: .SUFFIXES: .html .xml .sgml .tex .dvi .ps .pdf .rtf .gz .bz2 .txt - +.PRECIOUS: %.html %.dvi # General rules: %.rtf: %.xml $(JADE) $(CATALOG) -d $(PRINT_STYLESHEET) -t rtf $(XMLDCL) $<
[PHP-DOC] cvs: phpdoc / Makefile.in
jimwSun Jan 20 18:37:04 2002 EDT Modified files: /phpdoc Makefile.in Log: wow, that license block was bad. Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.104 phpdoc/Makefile.in:1.105 --- phpdoc/Makefile.in:1.104Fri Jan 18 16:57:45 2002 +++ phpdoc/Makefile.in Sun Jan 20 18:37:04 2002 @@ -1,23 +1,19 @@ - -# +--+ -# | PHP Version 4.0 | # +--+ # | Copyright (c) 1997-2002 The PHP Group| # +--+ -# | This source file is subject to version 2.02 of the PHP licience, | -# | that is bundled with this package in the file LICENCE and is | -# | avalible through the world wide web at | -# | http://www.php.net/license/2_02.txt. | +# | This source file is subject to version 2.02 of the PHP license, | +# | that is bundled with this package in the file LICENSE and is | +# | available online at http://www.php.net/license/2_02.txt. | # | If you did not receive a copy of the PHP license and are unable to | -# | obtain it through the world wide web, please send a note to | -# | [EMAIL PROTECTED] so we can mail you a copy immediately| +# | obtain it online, please send a note to [EMAIL PROTECTED] so we can| +# | mail you a copy. | # +--+ # | Authors: Stig Bakken <[EMAIL PROTECTED]> | # +--+ # # -# $Id: Makefile.in,v 1.104 2002/01/18 21:57:45 goba Exp $ +# $Id: Makefile.in,v 1.105 2002/01/20 23:37:04 jimw Exp $ # all: html
[PHP-DOC] cvs: phpdoc / Makefile.in
gobaFri Jan 18 16:57:45 2002 EDT Modified files: /phpdoc Makefile.in Log: As $(LANG) contains jade/nsgmls specific "-D ." option, add a new $(LANGCODE) var for other programs... Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.103 phpdoc/Makefile.in:1.104 --- phpdoc/Makefile.in:1.103Thu Jan 17 06:16:21 2002 +++ phpdoc/Makefile.in Fri Jan 18 16:57:45 2002 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.103 2002/01/17 11:16:21 hholzgra Exp $ +# $Id: Makefile.in,v 1.104 2002/01/18 21:57:45 goba Exp $ # all: html @@ -29,6 +29,7 @@ srcdir=@srcdir@ scriptdir=@srcdir@/scripts PHP_SOURCE=@PHP_SOURCE@ +LANGCODE=@LANG@ LANG=@LANG@ -D . JADE=@SP_OPTIONS@ @JADE@ -D . -wno-idref NSGMLS=@SP_OPTIONS@ @NSGMLS@ @@ -92,7 +93,7 @@ $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt revcheck.html: FORCE - PHPDOCDIR=$(srcdir) $(PHP) -f $(scriptdir)/revcheck.php $(LANG) > revcheck.html + PHPDOCDIR=$(srcdir) $(PHP) -f $(scriptdir)/revcheck.php $(LANGCODE) > +revcheck.html funcindex.xml: quickref.txt @if test "$(PHP)" = "no"; then \
[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
hholzgraWed Jan 16 13:36:07 2002 EDT Modified files: /phpdoc Makefile.in Log: missed this one on the last commit Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.101 phpdoc/Makefile.in:1.102 --- phpdoc/Makefile.in:1.101Wed Jan 16 13:30:43 2002 +++ phpdoc/Makefile.in Wed Jan 16 13:36:07 2002 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.101 2002/01/16 18:30:43 hholzgra Exp $ +# $Id: Makefile.in,v 1.102 2002/01/16 18:36:07 hholzgra Exp $ # all: html @@ -134,7 +134,7 @@ # intermediate file for name change .INTERMEDIATE: @MANUAL@.xml -php_manual_en.xml: manual.xml +@MANUAL@.xml: manual.xml cp manual.xml $@ @MANUAL@.html: @MANUAL@.xml $(HTML_DEPS)
[PHP-DOC] cvs: phpdoc / Makefile.in
hholzgraWed Jan 16 13:30:44 2002 EDT Modified files: /phpdoc Makefile.in Log: more fixes for the automatic build system Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.100 phpdoc/Makefile.in:1.101 --- phpdoc/Makefile.in:1.100Fri Jan 11 17:32:04 2002 +++ phpdoc/Makefile.in Wed Jan 16 13:30:43 2002 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.100 2002/01/11 22:32:04 hholzgra Exp $ +# $Id: Makefile.in,v 1.101 2002/01/16 18:30:43 hholzgra Exp $ # all: html @@ -129,11 +129,11 @@ echo '' > $@ $(JADE) $(CATALOG) -d $(KDEVELOP_TOC_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e's/\& /\& /g' >> $@ -scripts/makedoc: scripts/makedoc.cc - g++ -o scripts/makedoc scripts/makedoc.cc +@srcdir@/scripts/makedoc: @srcdir@scripts/makedoc.cc + g++ -o @srcdir@scripts/makedoc @srcdir@scripts/makedoc.cc # intermediate file for name change -.INTERMEDIATE: php_manual_en.xml +.INTERMEDIATE: @MANUAL@.xml php_manual_en.xml: manual.xml cp manual.xml $@ @@ -147,8 +147,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 scripts/makedoc - ./scripts/makedoc -b @MANUAL@.txt @MANUAL@.doc.pdb @PALMDOCTITLE@ +@MANUAL@.doc.pdb: @MANUAL@.txt @srcdir@/scripts/makedoc + @srcdir@/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 @@ -240,7 +240,7 @@ 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 scripts/makedoc *.manifest + rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest rm -f *.aux *.tex *.log *.dvi *.toc *.ps *.gz rm -f status.txt missing.txt rm -f entities/chapters.ent
