momo Fri Jan 30 00:49:17 2004 EDT
Modified files:
/livedocs build-ops.in build.sh common.php config.php.in
configure.in mktoc.php
Log:
1. make cygwin happy
2. fix bug when using relative path and more then one language on the --with-docs
instruction
3. more magic_quotes issues
http://cvs.php.net/diff.php/livedocs/build-ops.in?r1=1.4&r2=1.5&ty=u
Index: livedocs/build-ops.in
diff -u livedocs/build-ops.in:1.4 livedocs/build-ops.in:1.5
--- livedocs/build-ops.in:1.4 Tue Jan 13 05:57:06 2004
+++ livedocs/build-ops.in Fri Jan 30 00:49:15 2004
@@ -6,6 +6,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+PHPDOCFORPHP='@PHPDOCFORPHP@'
+LIVEDOCSFORPHP='@LIVEDOCSFORPHP@'
+OUTPUTDIRFORPHP='@OUTPUTDIRFORPHP@'
+GENDIRFORPHP='@GENDIRFORPHP@'
# "en" should be the first!
# LANGUAGES="en ar cs de es fi fr he hk hu it ja kr lt nl pl pt_BR ro ru sk sl sv tr
tw zh"
LANGUAGES="@LANGUAGES@"
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.17&r2=1.18&ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.17 livedocs/build.sh:1.18
--- livedocs/build.sh:1.17 Fri Jan 23 13:27:17 2004
+++ livedocs/build.sh Fri Jan 30 00:49:15 2004
@@ -11,6 +11,7 @@
autoconf
# Making indexes for every language
+curpath=`pwd`
for i in ${LANGUAGES};
do
echo -n "Configuring phpdoc for $i: "
@@ -27,13 +28,14 @@
#Just for debuging
#xmllint --format ${GENDIR}/toc-ugly.xml > ${GENDIR}/toc.xml
-
- ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc-ugly.xml >
${GENDIR}/toc-insert.sql
+
+ ${PHP} ${LIVEDOCSFORPHP}/mktoc.php ${GENDIRFORPHP}/toc-ugly.xml >
${GENDIR}/toc-insert.sql
+ cd $curpath
fi
echo -n "Making index for $i: "
date
- ${PHP} ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR}
+ ${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
# create output dir
mkdir -p ${OUTPUTDIR}/$i
http://cvs.php.net/diff.php/livedocs/common.php?r1=1.5&r2=1.6&ty=u
Index: livedocs/common.php
diff -u livedocs/common.php:1.5 livedocs/common.php:1.6
--- livedocs/common.php:1.5 Fri Jan 23 09:58:38 2004
+++ livedocs/common.php Fri Jan 30 00:49:15 2004
@@ -18,8 +18,8 @@
// | Common PHP header, with some basic settings |
// +----------------------------------------------------------------------+
//
-// $Id: common.php,v 1.5 2004/01/23 14:58:38 didou Exp $
-
+// $Id: common.php,v 1.6 2004/01/30 05:49:15 momo Exp $
+set_magic_quotes_runtime(0);
error_reporting(E_ALL);
ini_set('display_errors', '1');
http://cvs.php.net/diff.php/livedocs/config.php.in?r1=1.4&r2=1.5&ty=u
Index: livedocs/config.php.in
diff -u livedocs/config.php.in:1.4 livedocs/config.php.in:1.5
--- livedocs/config.php.in:1.4 Fri Jan 23 09:58:38 2004
+++ livedocs/config.php.in Fri Jan 30 00:49:15 2004
@@ -1,13 +1,13 @@
-<?php # $Id: config.php.in,v 1.4 2004/01/23 14:58:38 didou Exp $
+<?php # $Id: config.php.in,v 1.5 2004/01/30 05:49:15 momo Exp $
/* Config file for the livedocs */
define('FALLBACK_LANG', 'en');
-define('PHPDOC', '@PHPDOC@');
-define('LIVEDOCS', '@LIVEDOCS@');
-define('OUTPUTDIR', '@OUTPUTDIR@');
+define('PHPDOC', '@PHPDOCFORPHP@');
+define('LIVEDOCS', '@LIVEDOCSFORPHP@');
+define('OUTPUTDIR', '@OUTPUTDIRFORPHP@');
define('FORCE_DYNAMIC', @FORCE_DYNAMIC@);
define('WEBBASE', '@WEBBASE@');
-define('GENDIR', '@GENDIR@');
+define('GENDIR', '@GENDIRFORPHP@');
define('LANGUAGES', '@LANGUAGES@');
define('THEME_NAME', '@THEMENAME@');
http://cvs.php.net/diff.php/livedocs/configure.in?r1=1.14&r2=1.15&ty=u
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.14 livedocs/configure.in:1.15
--- livedocs/configure.in:1.14 Fri Jan 23 09:58:38 2004
+++ livedocs/configure.in Fri Jan 30 00:49:15 2004
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.14 2004/01/23 14:58:38 didou Exp $
+## $Id: configure.in,v 1.15 2004/01/30 05:49:15 momo Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.css)
@@ -88,6 +88,20 @@
[GENDIR="$withval"],
[GENDIR="/tmp"])
+if test `uname|grep CYGWIN` ; then
+ lncmd='cp -rf'
+ PHPDOCFORPHP=`cygpath -w $PHPDOC`
+ GENDIRFORPHP=`cygpath -w $GENDIR`
+ LIVEDOCSFORPHP=`cygpath -w $LIVEDOCS`
+ OUTPUTDIRFORPHP=`cygpath -w $OUTPUTDIR`
+else
+ lncmd='ln -sf'
+ PHPDOCFORPHP=$PHPDOC
+ GENDIRFORPHP=$GENDIR
+ LIVEDOCSFORPHP=$LIVEDOCS
+ OUTPUTDIRFORPHP=$OUTPUTDIR
+fi
+
AC_SUBST(BUILDLOG)
AC_SUBST(PHPDOC)
AC_SUBST(LIVEDOCS)
@@ -97,6 +111,10 @@
AC_SUBST(FORCE_DYNAMIC)
AC_SUBST(WEBBASE)
AC_SUBST(GENDIR)
+AC_SUBST(PHPDOCFORPHP)
+AC_SUBST(GENDIRFORPHP)
+AC_SUBST(LIVEDOCSFORPHP)
+AC_SUBST(OUTPUTDIRFORPHP)
AC_OUTPUT(build-ops config.php .htaccess)
@@ -106,12 +124,12 @@
echo "Copying livedoc files to $OUTPUTDIR..."
cp common.php config.php livedoc-index.php .htaccess $OUTPUTDIR
rm -f .htaccess
- ln -sf $LIVEDOCS/livedoc.php $OUTPUTDIR/index.php
- ln -sf $LIVEDOCS/error.php $OUTPUTDIR/error.php
- ln -sf $LIVEDOCS/style_mapping.php $OUTPUTDIR/style_mapping.php
- ln -sf $LIVEDOCS/xml_classes.php $OUTPUTDIR/xml_classes.php
- ln -sf $LIVEDOCS/search.php $OUTPUTDIR/search.php
- ln -sf $LIVEDOCS/themes $OUTPUTDIR/themes
+ $lncmd $LIVEDOCS/livedoc.php $OUTPUTDIR/index.php
+ $lncmd $LIVEDOCS/error.php $OUTPUTDIR/error.php
+ $lncmd $LIVEDOCS/style_mapping.php $OUTPUTDIR/style_mapping.php
+ $lncmd $LIVEDOCS/xml_classes.php $OUTPUTDIR/xml_classes.php
+ $lncmd $LIVEDOCS/search.php $OUTPUTDIR/search.php
+ $lncmd $LIVEDOCS/themes $OUTPUTDIR/themes
echo ""
echo "You have configured livedocs so that links are relative to
http://yourserver$WEBBASE";
echo "$OUTPUTDIR is assumed to be the dir that is displayed by your webserver for
that URL"
http://cvs.php.net/diff.php/livedocs/mktoc.php?r1=1.6&r2=1.7&ty=u
Index: livedocs/mktoc.php
diff -u livedocs/mktoc.php:1.6 livedocs/mktoc.php:1.7
--- livedocs/mktoc.php:1.6 Thu Jan 22 12:16:40 2004
+++ livedocs/mktoc.php Fri Jan 30 00:49:15 2004
@@ -20,9 +20,9 @@
// | tree into the toc table. |
// +----------------------------------------------------------------------+
//
-// $Id: mktoc.php,v 1.6 2004/01/22 17:16:40 nlopess Exp $
-
+// $Id: mktoc.php,v 1.7 2004/01/30 05:49:15 momo Exp $
+set_magic_quotes_runtime(0);
class DocBookTOCParser {
var $cdata = null;
var $id_stack = array();
