wez Thu Feb 5 09:59:16 2004 EDT
Modified files: /livedocs build-ops.in build.sh configure.in Log: Fixlets and handy things when running under cygwin. build.sh should now detect problems with phpdoc configure and/or xsltproc problems and skip the current language. Pass on PHP path to phpdoc configure http://cvs.php.net/diff.php/livedocs/build-ops.in?r1=1.5&r2=1.6&ty=u Index: livedocs/build-ops.in diff -u livedocs/build-ops.in:1.5 livedocs/build-ops.in:1.6 --- livedocs/build-ops.in:1.5 Fri Jan 30 00:49:15 2004 +++ livedocs/build-ops.in Thu Feb 5 09:59:16 2004 @@ -6,6 +6,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ +XSLTPROC='@XSLTPROC@' PHPDOCFORPHP='@PHPDOCFORPHP@' LIVEDOCSFORPHP='@LIVEDOCSFORPHP@' http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.19&r2=1.20&ty=u Index: livedocs/build.sh diff -u livedocs/build.sh:1.19 livedocs/build.sh:1.20 --- livedocs/build.sh:1.19 Sun Feb 1 13:25:28 2004 +++ livedocs/build.sh Thu Feb 5 09:59:16 2004 @@ -14,17 +14,24 @@ curpath=`pwd` for i in ${LANGUAGES}; do - echo -n "Configuring phpdoc for $i: " - date - cd ${PHPDOC} - ./configure --with-lang=$i + if test "$CONFIGURE_PHP_DOC" != "no" ; then + echo -n "Configuring phpdoc for $i: " + date + cd ${PHPDOC} + if ! ./configure --with-lang=$i --with-php="${PHP}" ; then + continue + fi + fi + cd ${GENDIR} # Making TOC as SQL insertion script if we're doing the english build if test "$i" = "en"; then echo -n "Making TOC: " date - xsltproc ${LIVEDOCS}/toc.xsl ${PHPDOC}/manual.xml > ${GENDIR}/toc-ugly.xml + if ! ${XSLTPROC} ${LIVEDOCS}/toc.xsl ${PHPDOC}/manual.xml > ${GENDIR}/toc-ugly.xml ; then + continue + fi #Just for debuging #xmllint --format ${GENDIR}/toc-ugly.xml > ${GENDIR}/toc.xml http://cvs.php.net/diff.php/livedocs/configure.in?r1=1.15&r2=1.16&ty=u Index: livedocs/configure.in diff -u livedocs/configure.in:1.15 livedocs/configure.in:1.16 --- livedocs/configure.in:1.15 Fri Jan 30 00:49:15 2004 +++ livedocs/configure.in Thu Feb 5 09:59:16 2004 @@ -1,5 +1,5 @@ ## A configure script -## $Id: configure.in,v 1.15 2004/01/30 05:49:15 momo Exp $ +## $Id: configure.in,v 1.16 2004/02/05 14:59:16 wez Exp $ AC_PREREQ(2.13) AC_INIT(livedoc.css) @@ -102,6 +102,8 @@ OUTPUTDIRFORPHP=$OUTPUTDIR fi +AC_PATH_PROG(XSLTPROC, xsltproc, no, $PATH) + AC_SUBST(BUILDLOG) AC_SUBST(PHPDOC) AC_SUBST(LIVEDOCS) @@ -115,6 +117,7 @@ AC_SUBST(GENDIRFORPHP) AC_SUBST(LIVEDOCSFORPHP) AC_SUBST(OUTPUTDIRFORPHP) +AC_SUBST(XSLTPROC) AC_OUTPUT(build-ops config.php .htaccess) @@ -129,6 +132,7 @@ $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 + rm -rf $OUTPUTDIR/themes $lncmd $LIVEDOCS/themes $OUTPUTDIR/themes echo "" echo "You have configured livedocs so that links are relative to http://yourserver$WEBBASE"