bjori Tue Jul 3 01:48:47 2007 UTC
Modified files:
/livedocs mk_peardoc.php mk_phpdoc.php mk_smarty.php mkindex.php
Log:
Partially revert my last commit
# These files dont read the full blown manual.xml
http://cvs.php.net/viewvc.cgi/livedocs/mk_peardoc.php?r1=1.9&r2=1.10&diff_format=u
Index: livedocs/mk_peardoc.php
diff -u livedocs/mk_peardoc.php:1.9 livedocs/mk_peardoc.php:1.10
--- livedocs/mk_peardoc.php:1.9 Tue Jul 3 01:23:05 2007
+++ livedocs/mk_peardoc.php Tue Jul 3 01:48:47 2007
@@ -18,14 +18,14 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_peardoc.php,v 1.9 2007/07/03 01:23:05 bjori Exp $
+// $Id: mk_peardoc.php,v 1.10 2007/07/03 01:48:47 bjori Exp $
define('MK_VERSION', false);
define('MANUAL_TITLE', 'PEAR Manual');
$parse_dirs = array('chapters', 'core', 'guide', 'package', 'pecl');
-$top_files = array(MANUAL_XML);
+$top_files = array('manual.xml');
$dir_skip_list = array('CVS' => 1, '.cvsignore' => 1, '.' => 1, '..' => 1);
http://cvs.php.net/viewvc.cgi/livedocs/mk_phpdoc.php?r1=1.17&r2=1.18&diff_format=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.17 livedocs/mk_phpdoc.php:1.18
--- livedocs/mk_phpdoc.php:1.17 Tue Jul 3 01:23:05 2007
+++ livedocs/mk_phpdoc.php Tue Jul 3 01:48:47 2007
@@ -18,14 +18,14 @@
// | Configuration file for phpdoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_phpdoc.php,v 1.17 2007/07/03 01:23:05 bjori Exp $
+// $Id: mk_phpdoc.php,v 1.18 2007/07/03 01:48:47 bjori Exp $
define('MK_VERSION', true);
define('MANUAL_TITLE', 'PHP Manual');
$parse_dirs = array('faq', 'reference', 'security', 'chapters', 'appendices',
'language', 'install');
-$top_files = array(MANUAL_XML, 'entities/builtin-extensions.xml');
+$top_files = array('manual.xml', 'entities/builtin-extensions.xml');
$dir_skip_list = array('CVS' => 1, '.cvsignore' => 1, '.' => 1, '..' => 1,
'figures' => 1);
http://cvs.php.net/viewvc.cgi/livedocs/mk_smarty.php?r1=1.9&r2=1.10&diff_format=u
Index: livedocs/mk_smarty.php
diff -u livedocs/mk_smarty.php:1.9 livedocs/mk_smarty.php:1.10
--- livedocs/mk_smarty.php:1.9 Tue Jul 3 01:23:05 2007
+++ livedocs/mk_smarty.php Tue Jul 3 01:48:47 2007
@@ -18,14 +18,14 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_smarty.php,v 1.9 2007/07/03 01:23:05 bjori Exp $
+// $Id: mk_smarty.php,v 1.10 2007/07/03 01:48:47 bjori Exp $
define('MK_VERSION', false);
define('MANUAL_TITLE', 'Smarty Manual');
$parse_dirs = array('designers', 'programmers', 'appendixes');
-$top_files = array(MANUAL_XML);
+$top_files = array('manual.xml');
$dir_skip_list = array('CVS' => 1, '.cvsignore' => 1, '.' => 1, '..' => 1);
http://cvs.php.net/viewvc.cgi/livedocs/mkindex.php?r1=1.51&r2=1.52&diff_format=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.51 livedocs/mkindex.php:1.52
--- livedocs/mkindex.php:1.51 Tue Jul 3 01:23:05 2007
+++ livedocs/mkindex.php Tue Jul 3 01:48:47 2007
@@ -19,7 +19,7 @@
// | construct an index |
// +----------------------------------------------------------------------+
//
-// $Id: mkindex.php,v 1.51 2007/07/03 01:23:05 bjori Exp $
+// $Id: mkindex.php,v 1.52 2007/07/03 01:48:47 bjori Exp $
/* just to be on the safe side */
@@ -36,7 +36,6 @@
$TMPDIR = $argv[3];
$BUILDTYPE = $argv[4];
-require dirname(__FILE__) . '/config.php';
require dirname(__FILE__) . '/mk_' . $BUILDTYPE . '.php';
function entity_replace($data) {