cvs: docweb / build-ops.in build-ops.php.in configure configure.in /cron/weekly howto /include docweb_language.class.php lib_phpt_generator.inc.php
lib_proj_lang.inc.php /scripts checkent.php gen_function_aliases.php gen_missing_examples.php gen_undocumented_functions.php populatedocs.sh
| From: | Hannes Magnusson | Date: | Sun, 03 Feb 2008 15:14:30 +0000 |
| Subject: | cvs: docweb / build-ops.in build-ops.php.in configure configure.in /cron/weekly howto /include docweb_language.class.php lib_phpt_generator.inc.php lib_proj_lang.inc.php /scripts checkent.php gen_function_aliases.php gen_missing_examples.php gen_undocumented_functions.php populatedocs.sh |
||
| Groups: | php.doc.web | ||
| Request: | Send a blank email to doc-web+get-965@lists.php.net to get a copy of this message | ||
bjori Sun Feb 3 15:14:30 2008 UTC
Modified files:
/docweb build-ops.in build-ops.php.in configure configure.in
/docweb/cron/weekly howto
/docweb/include docweb_language.class.php
lib_phpt_generator.inc.php lib_proj_lang.inc.php
/docweb/scripts checkent.php gen_function_aliases.php
gen_missing_examples.php
gen_undocumented_functions.php populatedocs.sh
Log:
Add the posibility to specify the directory for the cvs module checkouts
http://cvs.php.net/viewvc.cgi/docweb/build-ops.in?r1=1.8&r2=1.9&diff_format=u Index: docweb/build-ops.in diff -u docweb/build-ops.in:1.8 docweb/build-ops.in:1.9 --- docweb/build-ops.in:1.8 Sat Sep 15 01:23:54 2007 +++ docweb/build-ops.in Sun Feb 3 15:14:29 2008 @@ -3,6 +3,9 @@ PHP=@PHP@ CRONDIR=@CRONDIR@ CVSDIR=@CVSDIR@ +DOCDIR=@DOCDIR@ +GTKDIR=@GTKDIR@ +PEARDIR=@PEARDIR@ DOCWEB=@DOCWEB@ SCRIPTSDIR=@SCRIPTSDIR@ SQLDIR=@SQLDIR@ http://cvs.php.net/viewvc.cgi/docweb/build-ops.php.in?r1=1.5&r2=1.6&diff_format=u Index: docweb/build-ops.php.in diff -u docweb/build-ops.php.in:1.5 docweb/build-ops.php.in:1.6 --- docweb/build-ops.php.in:1.5 Sun Mar 5 18:06:43 2006 +++ docweb/build-ops.php.in Sun Feb 3 15:14:29 2008 @@ -1,10 +1,13 @@ <?php -// $Id: build-ops.php.in,v 1.5 2006/03/05 18:06:43 sean Exp $ +// $Id: build-ops.php.in,v 1.6 2008/02/03 15:14:29 bjori Exp $ // autoconf-generated file for docweb define('PHP_BINARY', '@PHP@'); define('CRON_DIR', '@CRONDIR@'); define('CVS_DIR', '@CVSDIR@'); +define('DOC_DIR', '@DOCDIR@'); +define('PEAR_DIR', '@PEARDIR@'); +define('GTK_DIR', '@GTKDIR@'); define('PATH_ROOT', '@DOCWEB@'); define('SCRIPTS_DIR', '@SCRIPTSDIR@'); define('SQL_DIR', '@SQLDIR@'); http://cvs.php.net/viewvc.cgi/docweb/configure?r1=1.7&r2=1.8&diff_format=u Index: docweb/configure diff -u docweb/configure:1.7 docweb/configure:1.8 --- docweb/configure:1.7 Sun Feb 3 14:04:26 2008 +++ docweb/configure Sun Feb 3 15:14:29 2008 @@ -16,7 +16,13 @@ ac_help="$ac_help --with-cron-dir[=DIR] CRON scripts location [default=`pwd`/cron]" ac_help="$ac_help - --with-cvs-dir[=DIR] CVS checkout location [default=`pwd`/cvs]" + --with-cvs-dir[=DIR] CVS root location [default=`pwd`/cvs]" +ac_help="$ac_help + --with-phpdoc-dir[=DIR] The phpdoc-all folder (under CVS root) [default=phpdoc-all]" +ac_help="$ac_help + --with-gtk-doc-dir[=DIR] The gtk-doc-dir folder (under CVS root) [default=php-gtk-doc]" +ac_help="$ac_help + --with-peardoc-dir[=DIR] The peardoc folder (under CVS root) [default=peardoc]" ac_help="$ac_help --with-scripts-dir[=DIR] Scripts location [default=`pwd`/scripts]" ac_help="$ac_help @@ -573,7 +579,7 @@ if test $withval != "yes"; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:577: checking for php" >&5 +echo "configure:583: checking for php" >&5 if test -x $withval; then PHP=$withval echo "$ac_t""$PHP" 1>&6 @@ -585,14 +591,14 @@ else if test -e ../phpdoc-tools/php.bat ; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:589: checking for php" >&5 +echo "configure:595: checking for php" >&5 PHP=../phpdoc-tools/php.bat echo "$ac_t""$PHP" 1>&6 else # Extract the first word of ""php"", so it can be a program name with args. set dummy "php"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:596: checking for $ac_word" >&5 +echo "configure:602: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -629,7 +635,7 @@ # Extract the first word of ""php4"", so it can be a program name with args. set dummy "php4"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:633: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -671,14 +677,14 @@ if test -e ../phpdoc-tools/php.bat ; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:675: checking for php" >&5 +echo "configure:681: checking for php" >&5 PHP=../phpdoc-tools/php.bat echo "$ac_t""$PHP" 1>&6 else # Extract the first word of ""php"", so it can be a program name with args. set dummy "php"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:682: checking for $ac_word" >&5 +echo "configure:688: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -715,7 +721,7 @@ # Extract the first word of ""php4"", so it can be a program name with args. set dummy "php4"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:719: checking for $ac_word" >&5 +echo "configure:725: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -777,6 +783,33 @@ fi +# Check whether --with-phpdoc-dir or --without-phpdoc-dir was given. +if test "${with_phpdoc_dir+set}" = set; then + withval="$with_phpdoc_dir" + DOCDIR="$withval" +else + DOCDIR="phpdoc-all" +fi + + +# Check whether --with-gtk-doc-dir or --without-gtk-doc-dir was given. +if test "${with_gtk_doc_dir+set}" = set; then + withval="$with_gtk_doc_dir" + GTKDIR="$withval" +else + GTKDIR="php-gtk-doc" +fi + + +# Check whether --with-peardoc-dir or --without-peardoc-dir was given. +if test "${with_peardoc_dir+set}" = set; then + withval="$with_peardoc_dir" + PEARDIR="$withval" +else + PEARDIR="peardoc" +fi + + # Check whether --with-scripts-dir or --without-scripts-dir was given. if test "${with_scripts_dir+set}" = set; then withval="$with_scripts_dir" @@ -878,6 +911,9 @@ + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1026,6 +1062,9 @@ s%@PHP4@%$PHP4%g s%@CRONDIR@%$CRONDIR%g s%@CVSDIR@%$CVSDIR%g +s%@DOCDIR@%$DOCDIR%g +s%@GTKDIR@%$GTKDIR%g +s%@PEARDIR@%$PEARDIR%g s%@DOCWEB@%$DOCWEB%g s%@SCRIPTSDIR@%$SCRIPTSDIR%g s%@SQLDIR@%$SQLDIR%g http://cvs.php.net/viewvc.cgi/docweb/configure.in?r1=1.10&r2=1.11&diff_format=u Index: docweb/configure.in diff -u docweb/configure.in:1.10 docweb/configure.in:1.11 --- docweb/configure.in:1.10 Sun Feb 3 14:04:26 2008 +++ docweb/configure.in Sun Feb 3 15:14:29 2008 @@ -1,5 +1,5 @@ ## A configure script -## $Id: configure.in,v 1.10 2008/02/03 14:04:26 bjori Exp $ +## $Id: configure.in,v 1.11 2008/02/03 15:14:29 bjori Exp $ AC_PREREQ(2.13) AC_INIT() @@ -53,10 +53,22 @@ [CRONDIR="$withval"], [CRONDIR="`pwd`/cron/"]) -AC_ARG_WITH(cvs-dir,[ --with-cvs-dir[=DIR] CVS checkout location [default=`pwd`/cvs]], +AC_ARG_WITH(cvs-dir,[ --with-cvs-dir[=DIR] CVS root location [default=`pwd`/cvs]], [CVSDIR="$withval"], [CVSDIR="`pwd`/cvs/"]) +AC_ARG_WITH(phpdoc-dir,[ --with-phpdoc-dir[=DIR] The phpdoc-all folder (under CVS root) [default=phpdoc-all]], + [DOCDIR="$withval"], + [DOCDIR="phpdoc-all"]) + +AC_ARG_WITH(gtk-doc-dir,[ --with-gtk-doc-dir[=DIR] The gtk-doc-dir folder (under CVS root) [default=php-gtk-doc]], + [GTKDIR="$withval"], + [GTKDIR="php-gtk-doc"]) + +AC_ARG_WITH(peardoc-dir,[ --with-peardoc-dir[=DIR] The peardoc folder (under CVS root) [default=peardoc]], + [PEARDIR="$withval"], + [PEARDIR="peardoc"]) + AC_ARG_WITH(scripts-dir,[ --with-scripts-dir[=DIR] Scripts location [default=`pwd`/scripts]], [SCRIPTSDIR="$withval"], [SCRIPTSDIR="`pwd`/scripts/"]) @@ -108,6 +120,9 @@ AC_SUBST(PHP) AC_SUBST(CRONDIR) AC_SUBST(CVSDIR) +AC_SUBST(DOCDIR) +AC_SUBST(GTKDIR) +AC_SUBST(PEARDIR) AC_SUBST(DOCWEB) AC_SUBST(SCRIPTSDIR) AC_SUBST(SQLDIR) http://cvs.php.net/viewvc.cgi/docweb/cron/weekly/howto?r1=1.3&r2=1.4&diff_format=u Index: docweb/cron/weekly/howto diff -u docweb/cron/weekly/howto:1.3 docweb/cron/weekly/howto:1.4 --- docweb/cron/weekly/howto:1.3 Tue May 24 12:44:16 2005 +++ docweb/cron/weekly/howto Sun Feb 3 15:14:30 2008 @@ -2,7 +2,7 @@ . `dirname $0`/../../build-ops -cd ${CVSDIR}/phpdoc-all +cd ${CVSDIR}/${DOCDIR} autoconf ./configure --with-jade=/usr/local/bin/jade --with-nsgmls=/usr/local/bin/nsgmls make howtophp http://cvs.php.net/viewvc.cgi/docweb/include/docweb_language.class.php?r1=1.6&r2=1.7&diff_format=u Index: docweb/include/docweb_language.class.php diff -u docweb/include/docweb_language.class.php:1.6 docweb/include/docweb_language.class.php:1.7 --- docweb/include/docweb_language.class.php:1.6 Wed Jan 26 13:38:33 2005 +++ docweb/include/docweb_language.class.php Sun Feb 3 15:14:30 2008 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: docweb_language.class.php,v 1.6 2005/01/26 13:38:33 nlopess Exp $ +$Id: docweb_language.class.php,v 1.7 2008/02/03 15:14:30 bjori Exp $ */ /** @@ -86,7 +86,7 @@ } // use this file: - $entFile = CVS_DIR ."/phpdoc-all/$lang/docweb/main.ent"; + $entFile = CVS_DIR .'/' .DOC_DIR ."/$lang/docweb/main.ent"; if (is_readable($entFile)) { // file is good; get its contents http://cvs.php.net/viewvc.cgi/docweb/include/lib_phpt_generator.inc.php?r1=1.6&r2=1.7&diff_format=u Index: docweb/include/lib_phpt_generator.inc.php diff -u docweb/include/lib_phpt_generator.inc.php:1.6 docweb/include/lib_phpt_generator.inc.php:1.7 --- docweb/include/lib_phpt_generator.inc.php:1.6 Thu Mar 15 08:32:02 2007 +++ docweb/include/lib_phpt_generator.inc.php Sun Feb 3 15:14:30 2008 @@ -15,14 +15,14 @@ +----------------------------------------------------------------------+ | Authors: Etienne Kneuss <colder@php.net> | +----------------------------------------------------------------------+ -$Id: lib_phpt_generator.inc.php,v 1.6 2007/03/15 08:32:02 colder Exp $ +$Id: lib_phpt_generator.inc.php,v 1.7 2008/02/03 15:14:30 bjori Exp $ */ /** * Parameters */ define('PHPT_EOL', "\n"); define('PHPT_SQLITE_FILE', SQLITE_DIR . 'tests.sqlite'); -define('PHPT_DOC_PATH', CVS_DIR.'phpdoc-all/en/'); +define('PHPT_DOC_PATH', CVS_DIR . '/' .DOC_DIR. '/en/'); define('PHPT_LIMIT_RESULTS', 200); http://cvs.php.net/viewvc.cgi/docweb/include/lib_proj_lang.inc.php?r1=1.11&r2=1.12&diff_format=u Index: docweb/include/lib_proj_lang.inc.php diff -u docweb/include/lib_proj_lang.inc.php:1.11 docweb/include/lib_proj_lang.inc.php:1.12 --- docweb/include/lib_proj_lang.inc.php:1.11 Sat Sep 15 01:23:54 2007 +++ docweb/include/lib_proj_lang.inc.php Sun Feb 3 15:14:30 2008 @@ -19,7 +19,7 @@ | Gabor Hojtsy <goba@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: lib_proj_lang.inc.php,v 1.11 2007/09/15 01:23:54 philip Exp $ +$Id: lib_proj_lang.inc.php,v 1.12 2008/02/03 15:14:30 bjori Exp $ */ // split from lib_general.inc.php @@ -28,10 +28,10 @@ $PROJECTS = array( // project => (Name, local folder, cvs module) 'www' => array('Documentation', '', ''), - 'php' => array('PHP Documentation', 'phpdoc-all', 'phpdoc/en'), + 'php' => array('PHP Documentation', DOC_DIR, 'phpdoc/en'), 'smarty' => array('Smarty', 'smarty/docs', 'smarty/docs/en'), - 'pear' => array('PEAR Documentation', 'peardoc', 'peardoc/en'), - 'gtk' => array('PHP-GTK Documentation', 'php-gtk-doc', 'php-gtk-doc/manual/en'), + 'pear' => array('PEAR Documentation', PEAR_DIR, 'peardoc/en'), + 'gtk' => array('PHP-GTK Documentation', GTK_DIR, 'php-gtk-doc/manual/en'), 'phd' => array('phd', '', ''), ); http://cvs.php.net/viewvc.cgi/docweb/scripts/checkent.php?r1=1.20&r2=1.21&diff_format=u Index: docweb/scripts/checkent.php diff -u docweb/scripts/checkent.php:1.20 docweb/scripts/checkent.php:1.21 --- docweb/scripts/checkent.php:1.20 Sun Apr 24 11:33:10 2005 +++ docweb/scripts/checkent.php Sun Feb 3 15:14:30 2008 @@ -19,7 +19,7 @@ | Mehdi Achour <didou@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: checkent.php,v 1.20 2005/04/24 11:33:10 nlopess Exp $ +$Id: checkent.php,v 1.21 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -30,12 +30,12 @@ // determine type (and display usage on fail) switch (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : false) { case 'phpdoc': - $filename = CVS_DIR . '/phpdoc-all/entities/global.ent'; + $filename = CVS_DIR . '/' . DOC_DIR. '/entities/global.ent'; $entType = 'php'; break; case 'peardoc': - $filename = CVS_DIR . '/peardoc/global.ent'; + $filename = CVS_DIR . '/' . PEAR_DIR. '/global.ent'; $entType = 'pear'; break; @@ -45,7 +45,7 @@ break; case 'gtk': - $filename = CVS_DIR . '/php-gtk-doc/manual/global.ent'; + $filename = CVS_DIR . GTK_DIR. '/manual/global.ent'; $entType = 'gtk'; break; http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_function_aliases.php?r1=1.2&r2=1.3&diff_format=u Index: docweb/scripts/gen_function_aliases.php diff -u docweb/scripts/gen_function_aliases.php:1.2 docweb/scripts/gen_function_aliases.php:1.3 --- docweb/scripts/gen_function_aliases.php:1.2 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_function_aliases.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_function_aliases.php,v 1.2 2005/02/07 05:04:06 sean Exp $ +$Id: gen_function_aliases.php,v 1.3 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -40,7 +40,7 @@ 'apache' => 'sapi/apache/php_apache.c', ); -$phpsrc = CVS_DIR . '/php-src/'; +$phpsrc = SRC_DIR; // search the extensions $exts = array(); @@ -95,4 +95,5 @@ $DAO->metaLogEndTime('aliases'); echo "** Done.\n"; -?> \ No newline at end of file +?> + http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_missing_examples.php?r1=1.1&r2=1.2&diff_format=u Index: docweb/scripts/gen_missing_examples.php diff -u docweb/scripts/gen_missing_examples.php:1.1 docweb/scripts/gen_missing_examples.php:1.2 --- docweb/scripts/gen_missing_examples.php:1.1 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_missing_examples.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_missing_examples.php,v 1.1 2005/02/07 05:04:06 sean Exp $ +$Id: gen_missing_examples.php,v 1.2 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -31,7 +31,7 @@ $DAO = new DocWeb_DAO_MetaInfo(TRUE); -$reference = CVS_DIR . '/phpdoc-all/en/reference'; +$reference = CVS_DIR . '/' .DOC_DIR .'/en/reference'; $excludefuncs = array( 'overload' => 'The example is in the introductory section', @@ -131,4 +131,4 @@ echo "** Done.\n"; -?> \ No newline at end of file +?> http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_undocumented_functions.php?r1=1.1&r2=1.2&diff_format=u Index: docweb/scripts/gen_undocumented_functions.php diff -u docweb/scripts/gen_undocumented_functions.php:1.1 docweb/scripts/gen_undocumented_functions.php:1.2 --- docweb/scripts/gen_undocumented_functions.php:1.1 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_undocumented_functions.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_undocumented_functions.php,v 1.1 2005/02/07 05:04:06 sean Exp $ +$Id: gen_undocumented_functions.php,v 1.2 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -31,7 +31,7 @@ $DAO = new DocWeb_DAO_MetaInfo(TRUE); -$reference = CVS_DIR . "/phpdoc-all/en/reference"; +$reference = CVS_DIR . '/' . DOC_DIR ."/en/reference"; $exts = array(); $dir = opendir($reference); @@ -110,4 +110,4 @@ echo "** Done.\n"; -?> \ No newline at end of file +?> http://cvs.php.net/viewvc.cgi/docweb/scripts/populatedocs.sh?r1=1.10&r2=1.11&diff_format=u Index: docweb/scripts/populatedocs.sh diff -u docweb/scripts/populatedocs.sh:1.10 docweb/scripts/populatedocs.sh:1.11 --- docweb/scripts/populatedocs.sh:1.10 Sat Jan 27 19:03:38 2007 +++ docweb/scripts/populatedocs.sh Sun Feb 3 15:14:30 2008 @@ -15,8 +15,9 @@ # | Authors: Jacques Marneweck <jacques@php.net> | # +----------------------------------------------------------------------+ # -# $Id: populatedocs.sh,v 1.10 2007/01/27 19:03:38 sean Exp $ +# $Id: populatedocs.sh,v 1.11 2008/02/03 15:14:30 bjori Exp $ +CVSBIN=/usr/bin/cvs pushd . cd `dirname $0`/.. @@ -32,16 +33,43 @@ cd ${CVSDIR} echo "Checking out PHP docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co phpdoc-all +if [ -d ${DOCDIR} ] +then + (cd ${DOCDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${DOCDIR} phpdoc-all +fi + echo "Checking out PHP GTK docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co php-gtk-doc +if [ -d ${GTKDIR} ] +then + (cd ${GTKDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${GTKDIR} php-gtk-doc +fi + echo "Checking out Smarty docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co smarty/docs +${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co smarty/docs + echo "Checking out PEAR docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co peardoc +if [ -d ${PEARDIR} ] +then + (cd ${PEARDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${PEARDIR} peardoc +fi + echo "Checking out php-src..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co php-src +if [ -d ${SRCDIR} ] +then + (cd ${SRCDIR} && ${CVSBIN} up) +else + BDIR=basename ${SRCDIR} + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${BDIR} php-src +fi echo -n "Reverting directory:" popd +# vim: et ts=2 sw=2 +
http://cvs.php.net/viewvc.cgi/docweb/build-ops.in?r1=1.8&r2=1.9&diff_format=u Index: docweb/build-ops.in diff -u docweb/build-ops.in:1.8 docweb/build-ops.in:1.9 --- docweb/build-ops.in:1.8 Sat Sep 15 01:23:54 2007 +++ docweb/build-ops.in Sun Feb 3 15:14:29 2008 @@ -3,6 +3,9 @@ PHP=@PHP@ CRONDIR=@CRONDIR@ CVSDIR=@CVSDIR@ +DOCDIR=@DOCDIR@ +GTKDIR=@GTKDIR@ +PEARDIR=@PEARDIR@ DOCWEB=@DOCWEB@ SCRIPTSDIR=@SCRIPTSDIR@ SQLDIR=@SQLDIR@ http://cvs.php.net/viewvc.cgi/docweb/build-ops.php.in?r1=1.5&r2=1.6&diff_format=u Index: docweb/build-ops.php.in diff -u docweb/build-ops.php.in:1.5 docweb/build-ops.php.in:1.6 --- docweb/build-ops.php.in:1.5 Sun Mar 5 18:06:43 2006 +++ docweb/build-ops.php.in Sun Feb 3 15:14:29 2008 @@ -1,10 +1,13 @@ <?php -// $Id: build-ops.php.in,v 1.5 2006/03/05 18:06:43 sean Exp $ +// $Id: build-ops.php.in,v 1.6 2008/02/03 15:14:29 bjori Exp $ // autoconf-generated file for docweb define('PHP_BINARY', '@PHP@'); define('CRON_DIR', '@CRONDIR@'); define('CVS_DIR', '@CVSDIR@'); +define('DOC_DIR', '@DOCDIR@'); +define('PEAR_DIR', '@PEARDIR@'); +define('GTK_DIR', '@GTKDIR@'); define('PATH_ROOT', '@DOCWEB@'); define('SCRIPTS_DIR', '@SCRIPTSDIR@'); define('SQL_DIR', '@SQLDIR@'); http://cvs.php.net/viewvc.cgi/docweb/configure?r1=1.7&r2=1.8&diff_format=u Index: docweb/configure diff -u docweb/configure:1.7 docweb/configure:1.8 --- docweb/configure:1.7 Sun Feb 3 14:04:26 2008 +++ docweb/configure Sun Feb 3 15:14:29 2008 @@ -16,7 +16,13 @@ ac_help="$ac_help --with-cron-dir[=DIR] CRON scripts location [default=`pwd`/cron]" ac_help="$ac_help - --with-cvs-dir[=DIR] CVS checkout location [default=`pwd`/cvs]" + --with-cvs-dir[=DIR] CVS root location [default=`pwd`/cvs]" +ac_help="$ac_help + --with-phpdoc-dir[=DIR] The phpdoc-all folder (under CVS root) [default=phpdoc-all]" +ac_help="$ac_help + --with-gtk-doc-dir[=DIR] The gtk-doc-dir folder (under CVS root) [default=php-gtk-doc]" +ac_help="$ac_help + --with-peardoc-dir[=DIR] The peardoc folder (under CVS root) [default=peardoc]" ac_help="$ac_help --with-scripts-dir[=DIR] Scripts location [default=`pwd`/scripts]" ac_help="$ac_help @@ -573,7 +579,7 @@ if test $withval != "yes"; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:577: checking for php" >&5 +echo "configure:583: checking for php" >&5 if test -x $withval; then PHP=$withval echo "$ac_t""$PHP" 1>&6 @@ -585,14 +591,14 @@ else if test -e ../phpdoc-tools/php.bat ; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:589: checking for php" >&5 +echo "configure:595: checking for php" >&5 PHP=../phpdoc-tools/php.bat echo "$ac_t""$PHP" 1>&6 else # Extract the first word of ""php"", so it can be a program name with args. set dummy "php"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:596: checking for $ac_word" >&5 +echo "configure:602: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -629,7 +635,7 @@ # Extract the first word of ""php4"", so it can be a program name with args. set dummy "php4"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:633: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -671,14 +677,14 @@ if test -e ../phpdoc-tools/php.bat ; then echo $ac_n "checking for php""... $ac_c" 1>&6 -echo "configure:675: checking for php" >&5 +echo "configure:681: checking for php" >&5 PHP=../phpdoc-tools/php.bat echo "$ac_t""$PHP" 1>&6 else # Extract the first word of ""php"", so it can be a program name with args. set dummy "php"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:682: checking for $ac_word" >&5 +echo "configure:688: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -715,7 +721,7 @@ # Extract the first word of ""php4"", so it can be a program name with args. set dummy "php4"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:719: checking for $ac_word" >&5 +echo "configure:725: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PHP4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -777,6 +783,33 @@ fi +# Check whether --with-phpdoc-dir or --without-phpdoc-dir was given. +if test "${with_phpdoc_dir+set}" = set; then + withval="$with_phpdoc_dir" + DOCDIR="$withval" +else + DOCDIR="phpdoc-all" +fi + + +# Check whether --with-gtk-doc-dir or --without-gtk-doc-dir was given. +if test "${with_gtk_doc_dir+set}" = set; then + withval="$with_gtk_doc_dir" + GTKDIR="$withval" +else + GTKDIR="php-gtk-doc" +fi + + +# Check whether --with-peardoc-dir or --without-peardoc-dir was given. +if test "${with_peardoc_dir+set}" = set; then + withval="$with_peardoc_dir" + PEARDIR="$withval" +else + PEARDIR="peardoc" +fi + + # Check whether --with-scripts-dir or --without-scripts-dir was given. if test "${with_scripts_dir+set}" = set; then withval="$with_scripts_dir" @@ -878,6 +911,9 @@ + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1026,6 +1062,9 @@ s%@PHP4@%$PHP4%g s%@CRONDIR@%$CRONDIR%g s%@CVSDIR@%$CVSDIR%g +s%@DOCDIR@%$DOCDIR%g +s%@GTKDIR@%$GTKDIR%g +s%@PEARDIR@%$PEARDIR%g s%@DOCWEB@%$DOCWEB%g s%@SCRIPTSDIR@%$SCRIPTSDIR%g s%@SQLDIR@%$SQLDIR%g http://cvs.php.net/viewvc.cgi/docweb/configure.in?r1=1.10&r2=1.11&diff_format=u Index: docweb/configure.in diff -u docweb/configure.in:1.10 docweb/configure.in:1.11 --- docweb/configure.in:1.10 Sun Feb 3 14:04:26 2008 +++ docweb/configure.in Sun Feb 3 15:14:29 2008 @@ -1,5 +1,5 @@ ## A configure script -## $Id: configure.in,v 1.10 2008/02/03 14:04:26 bjori Exp $ +## $Id: configure.in,v 1.11 2008/02/03 15:14:29 bjori Exp $ AC_PREREQ(2.13) AC_INIT() @@ -53,10 +53,22 @@ [CRONDIR="$withval"], [CRONDIR="`pwd`/cron/"]) -AC_ARG_WITH(cvs-dir,[ --with-cvs-dir[=DIR] CVS checkout location [default=`pwd`/cvs]], +AC_ARG_WITH(cvs-dir,[ --with-cvs-dir[=DIR] CVS root location [default=`pwd`/cvs]], [CVSDIR="$withval"], [CVSDIR="`pwd`/cvs/"]) +AC_ARG_WITH(phpdoc-dir,[ --with-phpdoc-dir[=DIR] The phpdoc-all folder (under CVS root) [default=phpdoc-all]], + [DOCDIR="$withval"], + [DOCDIR="phpdoc-all"]) + +AC_ARG_WITH(gtk-doc-dir,[ --with-gtk-doc-dir[=DIR] The gtk-doc-dir folder (under CVS root) [default=php-gtk-doc]], + [GTKDIR="$withval"], + [GTKDIR="php-gtk-doc"]) + +AC_ARG_WITH(peardoc-dir,[ --with-peardoc-dir[=DIR] The peardoc folder (under CVS root) [default=peardoc]], + [PEARDIR="$withval"], + [PEARDIR="peardoc"]) + AC_ARG_WITH(scripts-dir,[ --with-scripts-dir[=DIR] Scripts location [default=`pwd`/scripts]], [SCRIPTSDIR="$withval"], [SCRIPTSDIR="`pwd`/scripts/"]) @@ -108,6 +120,9 @@ AC_SUBST(PHP) AC_SUBST(CRONDIR) AC_SUBST(CVSDIR) +AC_SUBST(DOCDIR) +AC_SUBST(GTKDIR) +AC_SUBST(PEARDIR) AC_SUBST(DOCWEB) AC_SUBST(SCRIPTSDIR) AC_SUBST(SQLDIR) http://cvs.php.net/viewvc.cgi/docweb/cron/weekly/howto?r1=1.3&r2=1.4&diff_format=u Index: docweb/cron/weekly/howto diff -u docweb/cron/weekly/howto:1.3 docweb/cron/weekly/howto:1.4 --- docweb/cron/weekly/howto:1.3 Tue May 24 12:44:16 2005 +++ docweb/cron/weekly/howto Sun Feb 3 15:14:30 2008 @@ -2,7 +2,7 @@ . `dirname $0`/../../build-ops -cd ${CVSDIR}/phpdoc-all +cd ${CVSDIR}/${DOCDIR} autoconf ./configure --with-jade=/usr/local/bin/jade --with-nsgmls=/usr/local/bin/nsgmls make howtophp http://cvs.php.net/viewvc.cgi/docweb/include/docweb_language.class.php?r1=1.6&r2=1.7&diff_format=u Index: docweb/include/docweb_language.class.php diff -u docweb/include/docweb_language.class.php:1.6 docweb/include/docweb_language.class.php:1.7 --- docweb/include/docweb_language.class.php:1.6 Wed Jan 26 13:38:33 2005 +++ docweb/include/docweb_language.class.php Sun Feb 3 15:14:30 2008 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: docweb_language.class.php,v 1.6 2005/01/26 13:38:33 nlopess Exp $ +$Id: docweb_language.class.php,v 1.7 2008/02/03 15:14:30 bjori Exp $ */ /** @@ -86,7 +86,7 @@ } // use this file: - $entFile = CVS_DIR ."/phpdoc-all/$lang/docweb/main.ent"; + $entFile = CVS_DIR .'/' .DOC_DIR ."/$lang/docweb/main.ent"; if (is_readable($entFile)) { // file is good; get its contents http://cvs.php.net/viewvc.cgi/docweb/include/lib_phpt_generator.inc.php?r1=1.6&r2=1.7&diff_format=u Index: docweb/include/lib_phpt_generator.inc.php diff -u docweb/include/lib_phpt_generator.inc.php:1.6 docweb/include/lib_phpt_generator.inc.php:1.7 --- docweb/include/lib_phpt_generator.inc.php:1.6 Thu Mar 15 08:32:02 2007 +++ docweb/include/lib_phpt_generator.inc.php Sun Feb 3 15:14:30 2008 @@ -15,14 +15,14 @@ +----------------------------------------------------------------------+ | Authors: Etienne Kneuss <colder@php.net> | +----------------------------------------------------------------------+ -$Id: lib_phpt_generator.inc.php,v 1.6 2007/03/15 08:32:02 colder Exp $ +$Id: lib_phpt_generator.inc.php,v 1.7 2008/02/03 15:14:30 bjori Exp $ */ /** * Parameters */ define('PHPT_EOL', "\n"); define('PHPT_SQLITE_FILE', SQLITE_DIR . 'tests.sqlite'); -define('PHPT_DOC_PATH', CVS_DIR.'phpdoc-all/en/'); +define('PHPT_DOC_PATH', CVS_DIR . '/' .DOC_DIR. '/en/'); define('PHPT_LIMIT_RESULTS', 200); http://cvs.php.net/viewvc.cgi/docweb/include/lib_proj_lang.inc.php?r1=1.11&r2=1.12&diff_format=u Index: docweb/include/lib_proj_lang.inc.php diff -u docweb/include/lib_proj_lang.inc.php:1.11 docweb/include/lib_proj_lang.inc.php:1.12 --- docweb/include/lib_proj_lang.inc.php:1.11 Sat Sep 15 01:23:54 2007 +++ docweb/include/lib_proj_lang.inc.php Sun Feb 3 15:14:30 2008 @@ -19,7 +19,7 @@ | Gabor Hojtsy <goba@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: lib_proj_lang.inc.php,v 1.11 2007/09/15 01:23:54 philip Exp $ +$Id: lib_proj_lang.inc.php,v 1.12 2008/02/03 15:14:30 bjori Exp $ */ // split from lib_general.inc.php @@ -28,10 +28,10 @@ $PROJECTS = array( // project => (Name, local folder, cvs module) 'www' => array('Documentation', '', ''), - 'php' => array('PHP Documentation', 'phpdoc-all', 'phpdoc/en'), + 'php' => array('PHP Documentation', DOC_DIR, 'phpdoc/en'), 'smarty' => array('Smarty', 'smarty/docs', 'smarty/docs/en'), - 'pear' => array('PEAR Documentation', 'peardoc', 'peardoc/en'), - 'gtk' => array('PHP-GTK Documentation', 'php-gtk-doc', 'php-gtk-doc/manual/en'), + 'pear' => array('PEAR Documentation', PEAR_DIR, 'peardoc/en'), + 'gtk' => array('PHP-GTK Documentation', GTK_DIR, 'php-gtk-doc/manual/en'), 'phd' => array('phd', '', ''), ); http://cvs.php.net/viewvc.cgi/docweb/scripts/checkent.php?r1=1.20&r2=1.21&diff_format=u Index: docweb/scripts/checkent.php diff -u docweb/scripts/checkent.php:1.20 docweb/scripts/checkent.php:1.21 --- docweb/scripts/checkent.php:1.20 Sun Apr 24 11:33:10 2005 +++ docweb/scripts/checkent.php Sun Feb 3 15:14:30 2008 @@ -19,7 +19,7 @@ | Mehdi Achour <didou@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: checkent.php,v 1.20 2005/04/24 11:33:10 nlopess Exp $ +$Id: checkent.php,v 1.21 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -30,12 +30,12 @@ // determine type (and display usage on fail) switch (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : false) { case 'phpdoc': - $filename = CVS_DIR . '/phpdoc-all/entities/global.ent'; + $filename = CVS_DIR . '/' . DOC_DIR. '/entities/global.ent'; $entType = 'php'; break; case 'peardoc': - $filename = CVS_DIR . '/peardoc/global.ent'; + $filename = CVS_DIR . '/' . PEAR_DIR. '/global.ent'; $entType = 'pear'; break; @@ -45,7 +45,7 @@ break; case 'gtk': - $filename = CVS_DIR . '/php-gtk-doc/manual/global.ent'; + $filename = CVS_DIR . GTK_DIR. '/manual/global.ent'; $entType = 'gtk'; break; http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_function_aliases.php?r1=1.2&r2=1.3&diff_format=u Index: docweb/scripts/gen_function_aliases.php diff -u docweb/scripts/gen_function_aliases.php:1.2 docweb/scripts/gen_function_aliases.php:1.3 --- docweb/scripts/gen_function_aliases.php:1.2 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_function_aliases.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_function_aliases.php,v 1.2 2005/02/07 05:04:06 sean Exp $ +$Id: gen_function_aliases.php,v 1.3 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -40,7 +40,7 @@ 'apache' => 'sapi/apache/php_apache.c', ); -$phpsrc = CVS_DIR . '/php-src/'; +$phpsrc = SRC_DIR; // search the extensions $exts = array(); @@ -95,4 +95,5 @@ $DAO->metaLogEndTime('aliases'); echo "** Done.\n"; -?> \ No newline at end of file +?> + http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_missing_examples.php?r1=1.1&r2=1.2&diff_format=u Index: docweb/scripts/gen_missing_examples.php diff -u docweb/scripts/gen_missing_examples.php:1.1 docweb/scripts/gen_missing_examples.php:1.2 --- docweb/scripts/gen_missing_examples.php:1.1 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_missing_examples.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_missing_examples.php,v 1.1 2005/02/07 05:04:06 sean Exp $ +$Id: gen_missing_examples.php,v 1.2 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -31,7 +31,7 @@ $DAO = new DocWeb_DAO_MetaInfo(TRUE); -$reference = CVS_DIR . '/phpdoc-all/en/reference'; +$reference = CVS_DIR . '/' .DOC_DIR .'/en/reference'; $excludefuncs = array( 'overload' => 'The example is in the introductory section', @@ -131,4 +131,4 @@ echo "** Done.\n"; -?> \ No newline at end of file +?> http://cvs.php.net/viewvc.cgi/docweb/scripts/gen_undocumented_functions.php?r1=1.1&r2=1.2&diff_format=u Index: docweb/scripts/gen_undocumented_functions.php diff -u docweb/scripts/gen_undocumented_functions.php:1.1 docweb/scripts/gen_undocumented_functions.php:1.2 --- docweb/scripts/gen_undocumented_functions.php:1.1 Mon Feb 7 05:04:06 2005 +++ docweb/scripts/gen_undocumented_functions.php Sun Feb 3 15:14:30 2008 @@ -17,7 +17,7 @@ | Author: Dave Barr <dave@php.net> | | DocWeb Port: Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: gen_undocumented_functions.php,v 1.1 2005/02/07 05:04:06 sean Exp $ +$Id: gen_undocumented_functions.php,v 1.2 2008/02/03 15:14:30 bjori Exp $ */ set_time_limit(0); @@ -31,7 +31,7 @@ $DAO = new DocWeb_DAO_MetaInfo(TRUE); -$reference = CVS_DIR . "/phpdoc-all/en/reference"; +$reference = CVS_DIR . '/' . DOC_DIR ."/en/reference"; $exts = array(); $dir = opendir($reference); @@ -110,4 +110,4 @@ echo "** Done.\n"; -?> \ No newline at end of file +?> http://cvs.php.net/viewvc.cgi/docweb/scripts/populatedocs.sh?r1=1.10&r2=1.11&diff_format=u Index: docweb/scripts/populatedocs.sh diff -u docweb/scripts/populatedocs.sh:1.10 docweb/scripts/populatedocs.sh:1.11 --- docweb/scripts/populatedocs.sh:1.10 Sat Jan 27 19:03:38 2007 +++ docweb/scripts/populatedocs.sh Sun Feb 3 15:14:30 2008 @@ -15,8 +15,9 @@ # | Authors: Jacques Marneweck <jacques@php.net> | # +----------------------------------------------------------------------+ # -# $Id: populatedocs.sh,v 1.10 2007/01/27 19:03:38 sean Exp $ +# $Id: populatedocs.sh,v 1.11 2008/02/03 15:14:30 bjori Exp $ +CVSBIN=/usr/bin/cvs pushd . cd `dirname $0`/.. @@ -32,16 +33,43 @@ cd ${CVSDIR} echo "Checking out PHP docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co phpdoc-all +if [ -d ${DOCDIR} ] +then + (cd ${DOCDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${DOCDIR} phpdoc-all +fi + echo "Checking out PHP GTK docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co php-gtk-doc +if [ -d ${GTKDIR} ] +then + (cd ${GTKDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${GTKDIR} php-gtk-doc +fi + echo "Checking out Smarty docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co smarty/docs +${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co smarty/docs + echo "Checking out PEAR docs..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co peardoc +if [ -d ${PEARDIR} ] +then + (cd ${PEARDIR} && ${CVSBIN} up) +else + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${PEARDIR} peardoc +fi + echo "Checking out php-src..." -/usr/bin/cvs -d :pserver:cvsread@cvs.php.net:/repository co php-src +if [ -d ${SRCDIR} ] +then + (cd ${SRCDIR} && ${CVSBIN} up) +else + BDIR=basename ${SRCDIR} + ${CVSBIN} -d :pserver:cvsread@cvs.php.net:/repository co -d ${BDIR} php-src +fi echo -n "Reverting directory:" popd +# vim: et ts=2 sw=2 +