bjori Tue Jul 3 01:23:05 2007 UTC
Modified files:
/livedocs config.php.in build.php mk_peardoc.php mk_phpdoc.php
mk_smarty.php mkindex.php
Log:
Make it possible to choose the root filename (sync with phpdoc)
http://cvs.php.net/viewvc.cgi/livedocs/config.php.in?r1=1.14&r2=1.15&diff_format=u
Index: livedocs/config.php.in
diff -u livedocs/config.php.in:1.14 livedocs/config.php.in:1.15
--- livedocs/config.php.in:1.14 Tue Jun 26 00:10:59 2007
+++ livedocs/config.php.in Tue Jul 3 01:23:05 2007
@@ -19,7 +19,7 @@
// | the ./configure call |
// +----------------------------------------------------------------------+
//
-// $Id: config.php.in,v 1.14 2007/06/26 00:10:59 gwynne Exp $
+// $Id: config.php.in,v 1.15 2007/07/03 01:23:05 bjori Exp $
define('PHP_PATH', '@PHP@');
define('BUILD_LOG', '@BUILDLOG@');
@@ -43,7 +43,14 @@
switch(BUILD_TYPE) {
case 'peardoc':
define('ROOT_NODE', 'guide');
+ define('MANUAL_XML', 'manual.xml');
break;
+ case 'phpdoc':
+ define('MANUAL_XML', '.manual.xml');
+ /* break omitted intentionally */
default:
+ if(!defined('MANUAL_XML')) {
+ define('MANUAL_XML', 'manual.xml');
+ }
define('ROOT_NODE', 'manual');
}
http://cvs.php.net/viewvc.cgi/livedocs/build.php?r1=1.3&r2=1.4&diff_format=u
Index: livedocs/build.php
diff -u livedocs/build.php:1.3 livedocs/build.php:1.4
--- livedocs/build.php:1.3 Sun Jul 1 22:52:47 2007
+++ livedocs/build.php Tue Jul 3 01:23:05 2007
@@ -14,6 +14,7 @@
$LANGUAGES = LANGUAGES;
$NOTES_MIRROR = NOTES_MIRROR;
$NOTES_TOKEN = NOTES_TOKEN;
+$MANUAL_XML = MANUAL_XML;
function buildmsg( $message ) {
static $log_file = NULL;
@@ -96,6 +97,7 @@
chdir( $PHPDOC );
if ( sneaky_shell_exec( "./configure --with-lang=" .
escapeshellarg( $i ) . " --with-php=\"{$PHP}\" " . PHPDOC_CONFIG_OPTS ) != 0 )
continue;
+ sneaky_shell_exec( "make {$MANUAL_XML}" );
}
chdir( $GENDIR );
@@ -108,7 +110,7 @@
else
$XSLTFILE = "toc.xsl";
- if ( sneaky_shell_exec( "{$XSLTPROC} --output
\"{$GENDIR}/toc-ugly.xml\" \"{$LIVEDOCS}/{$XSLTFILE}\"
\"{$PHPDOC}/manual.xml\"" ) != 0 )
+ if ( sneaky_shell_exec( "{$XSLTPROC} --output
\"{$GENDIR}/toc-ugly.xml\" \"{$LIVEDOCS}/{$XSLTFILE}\"
\"{$PHPDOC}/{$MANUAL_XML}\"" ) != 0 )
continue;
// For debugging:
http://cvs.php.net/viewvc.cgi/livedocs/mk_peardoc.php?r1=1.8&r2=1.9&diff_format=u
Index: livedocs/mk_peardoc.php
diff -u livedocs/mk_peardoc.php:1.8 livedocs/mk_peardoc.php:1.9
--- livedocs/mk_peardoc.php:1.8 Wed Feb 9 17:01:35 2005
+++ livedocs/mk_peardoc.php Tue Jul 3 01:23:05 2007
@@ -18,14 +18,14 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_peardoc.php,v 1.8 2005/02/09 17:01:35 iliaa Exp $
+// $Id: mk_peardoc.php,v 1.9 2007/07/03 01:23:05 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.16&r2=1.17&diff_format=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.16 livedocs/mk_phpdoc.php:1.17
--- livedocs/mk_phpdoc.php:1.16 Tue Jun 19 19:22:48 2007
+++ livedocs/mk_phpdoc.php Tue Jul 3 01:23:05 2007
@@ -18,14 +18,14 @@
// | Configuration file for phpdoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_phpdoc.php,v 1.16 2007/06/19 19:22:48 bjori Exp $
+// $Id: mk_phpdoc.php,v 1.17 2007/07/03 01:23:05 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.8&r2=1.9&diff_format=u
Index: livedocs/mk_smarty.php
diff -u livedocs/mk_smarty.php:1.8 livedocs/mk_smarty.php:1.9
--- livedocs/mk_smarty.php:1.8 Wed Feb 9 17:01:35 2005
+++ livedocs/mk_smarty.php Tue Jul 3 01:23:05 2007
@@ -18,14 +18,14 @@
// | Configuration file for peardoc build |
// +----------------------------------------------------------------------+
//
-// $Id: mk_smarty.php,v 1.8 2005/02/09 17:01:35 iliaa Exp $
+// $Id: mk_smarty.php,v 1.9 2007/07/03 01:23:05 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.50&r2=1.51&diff_format=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.50 livedocs/mkindex.php:1.51
--- livedocs/mkindex.php:1.50 Mon Jun 25 12:04:16 2007
+++ livedocs/mkindex.php Tue Jul 3 01:23:05 2007
@@ -19,7 +19,7 @@
// | construct an index |
// +----------------------------------------------------------------------+
//
-// $Id: mkindex.php,v 1.50 2007/06/25 12:04:16 bjori Exp $
+// $Id: mkindex.php,v 1.51 2007/07/03 01:23:05 bjori Exp $
/* just to be on the safe side */
@@ -36,6 +36,7 @@
$TMPDIR = $argv[3];
$BUILDTYPE = $argv[4];
+require dirname(__FILE__) . '/config.php';
require dirname(__FILE__) . '/mk_' . $BUILDTYPE . '.php';
function entity_replace($data) {
