iliaa Wed Feb 9 17:16:00 2005 EDT
Modified files:
/livedocs build-ops.in build.sh config.php.in configure.in
mkindex.php
Log:
Fixed bug #LIVEDOCS
http://cvs.php.net/diff.php/livedocs/build-ops.in?r1=1.12&r2=1.13&ty=u
Index: livedocs/build-ops.in
diff -u livedocs/build-ops.in:1.12 livedocs/build-ops.in:1.13
--- livedocs/build-ops.in:1.12 Thu Nov 11 14:46:01 2004
+++ livedocs/build-ops.in Wed Feb 9 17:15:59 2005
@@ -9,10 +9,6 @@
[EMAIL PROTECTED]@
XSLTPROC='@XSLTPROC@'
-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 nl pl pt_BR ro ru sk sv tw
zh"
LANGUAGES="@LANGUAGES@"
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.27&r2=1.28&ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.27 livedocs/build.sh:1.28
--- livedocs/build.sh:1.27 Wed Feb 9 14:37:02 2005
+++ livedocs/build.sh Wed Feb 9 17:15:59 2005
@@ -10,7 +10,7 @@
echo "Building user notes"
TOKEN=$NOTES_TOKEN
export TOKEN
- ${PHP} ${LIVEDOCSFORPHP}/mk_notes.php ${OUTPUTDIR} ${GENDIR}
${NOTES_MIRROR}
+ ${PHP} ${LIVEDOCS}/mk_notes.php ${OUTPUTDIR} ${GENDIR} ${NOTES_MIRROR}
#fi
# running ./buildconf
@@ -43,12 +43,12 @@
#Just for debuging
#xmllint --format ${GENDIR}/toc-ugly.xml > ${GENDIR}/toc.xml
- ${PHP} ${LIVEDOCSFORPHP}/mktoc.php ${GENDIRFORPHP}/toc-ugly.xml
> ${GENDIR}/toc-insert.sql
+ ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc-ugly.xml >
${GENDIR}/toc-insert.sql
fi
echo -n "Making index for $i: "
date
- ${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
${BUILDTYPE}
+ ${PHP} ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR} ${BUILDTYPE}
mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
# create output dir
mkdir -p ${OUTPUTDIR}/$i
http://cvs.php.net/diff.php/livedocs/config.php.in?r1=1.10&r2=1.11&ty=u
Index: livedocs/config.php.in
diff -u livedocs/config.php.in:1.10 livedocs/config.php.in:1.11
--- livedocs/config.php.in:1.10 Fri Jul 30 11:52:08 2004
+++ livedocs/config.php.in Wed Feb 9 17:16:00 2005
@@ -19,11 +19,11 @@
// | the ./configure call |
// +----------------------------------------------------------------------+
//
-// $Id: config.php.in,v 1.10 2004/07/30 15:52:08 iliaa Exp $
+// $Id: config.php.in,v 1.11 2005/02/09 22:16:00 iliaa Exp $
define('FALLBACK_LANG', 'en');
-define('PHPDOC', '@PHPDOCFORPHP@');
-define('OUTPUTDIR', '@OUTPUTDIRFORPHP@');
+define('PHPDOC', '@PHPDOC@');
+define('OUTPUTDIR', '@OUTPUTDIR@');
if (!defined('FORCE_DYNAMIC')) { // could already be defined by pregenerate.php
define('FORCE_DYNAMIC', @FORCE_DYNAMIC@);
}
http://cvs.php.net/diff.php/livedocs/configure.in?r1=1.30&r2=1.31&ty=u
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.30 livedocs/configure.in:1.31
--- livedocs/configure.in:1.30 Wed Feb 9 13:02:08 2005
+++ livedocs/configure.in Wed Feb 9 17:16:00 2005
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.30 2005/02/09 18:02:08 edink Exp $
+## $Id: configure.in,v 1.31 2005/02/09 22:16:00 iliaa Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.php)
@@ -108,16 +108,12 @@
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`
+ PHPDOC=`cygpath -m $PHPDOC`
+ GENDIR=`cygpath -m $GENDIR`
+ LIVEDOCS=`cygpath -m $LIVEDOCS`
+ OUTPUTDIR=`cygpath -m $OUTPUTDIR`
else
lncmd='ln -sf'
- PHPDOCFORPHP=$PHPDOC
- GENDIRFORPHP=$GENDIR
- LIVEDOCSFORPHP=$LIVEDOCS
- OUTPUTDIRFORPHP=$OUTPUTDIR
fi
AC_PATH_PROG(XSLTPROC, xsltproc, no, $PATH)
@@ -133,10 +129,6 @@
AC_SUBST(FORCE_DYNAMIC)
AC_SUBST(WEBBASE)
AC_SUBST(GENDIR)
-AC_SUBST(PHPDOCFORPHP)
-AC_SUBST(GENDIRFORPHP)
-AC_SUBST(LIVEDOCSFORPHP)
-AC_SUBST(OUTPUTDIRFORPHP)
AC_SUBST(XSLTPROC)
AC_SUBST(NOTES_MIRROR)
AC_SUBST(NOTES_TOKEN)
http://cvs.php.net/diff.php/livedocs/mkindex.php?r1=1.38&r2=1.39&ty=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.38 livedocs/mkindex.php:1.39
--- livedocs/mkindex.php:1.38 Wed Feb 9 12:01:35 2005
+++ livedocs/mkindex.php Wed Feb 9 17:16:00 2005
@@ -19,7 +19,7 @@
// | construct an index |
// +----------------------------------------------------------------------+
//
-// $Id: mkindex.php,v 1.38 2005/02/09 17:01:35 iliaa Exp $
+// $Id: mkindex.php,v 1.39 2005/02/09 22:16:00 iliaa Exp $
/* just to be on the safe side */
@@ -222,11 +222,11 @@
}
$x =
preg_match_all('/<!ENTITY\s+([a-zA-Z0-9.-]+)\s+SYSTEM\s+\'([^\']+)\'>/Usm', $d,
$matches);
- $docs = $GLOBALS['DOCS'] . DIRECTORY_SEPARATOR;
+ $docs = $GLOBALS['DOCS'] . '/';
$docslen = strlen($docs);
- $realdocs = realpath($docs) . DIRECTORY_SEPARATOR;
+ $realdocs = realpath($docs) . '/';
$reallen = strlen($realdocs);
- $lang = $GLOBALS['LANG'] . DIRECTORY_SEPARATOR;
+ $lang = $GLOBALS['LANG'] . '/';
$langlen = strlen($lang);
for ($i = 0; $i < $x; $i++) {
$id = sqlite_escape_string($matches[1][$i]);
