[PHP-DOC] cvs: livedocs / common.php mk_phpdoc.php mkindex.php

[Nuno Lopes]

nlopess         Sun Mar 21 05:45:15 2004 EDT

  Modified files:              
    /livedocs   common.php mk_phpdoc.php mkindex.php 
  Log:
  fixing a bug in language/* parsing
  
http://cvs.php.net/diff.php/livedocs/common.php?r1=1.8&r2=1.9&ty=u
Index: livedocs/common.php
diff -u livedocs/common.php:1.8 livedocs/common.php:1.9
--- livedocs/common.php:1.8     Sat Mar 20 05:23:54 2004
+++ livedocs/common.php Sun Mar 21 05:45:15 2004
@@ -18,15 +18,15 @@
 // | Common PHP header, with some basic settings                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: common.php,v 1.8 2004/03/20 10:23:54 nlopess Exp $
+// $Id: common.php,v 1.9 2004/03/21 10:45:15 nlopess Exp $
 set_magic_quotes_runtime(0);
 
-$compare = version_compare(phpversion(), '5.0.0RC1');
+/*$compare = version_compare(phpversion(), '5.0.0RC1');
 if ($compare == 1 || $compare == 0){
 error_reporting(E_ALL | E_STRICT);
-} else {
+} else {*/
 error_reporting(E_ALL);
-}
+//}
 
 ini_set('display_errors', '1');
 
http://cvs.php.net/diff.php/livedocs/mk_phpdoc.php?r1=1.2&r2=1.3&ty=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.2 livedocs/mk_phpdoc.php:1.3
--- livedocs/mk_phpdoc.php:1.2  Wed Mar 17 09:05:56 2004
+++ livedocs/mk_phpdoc.php      Sun Mar 21 05:45:15 2004
@@ -18,11 +18,11 @@
 // | Configuration file for phpdoc build                                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: mk_phpdoc.php,v 1.2 2004/03/17 14:05:56 didou Exp $
+// $Id: mk_phpdoc.php,v 1.3 2004/03/21 10:45:15 nlopess Exp $
 
 define('MK_VERSION', true);
 
-$parse_dirs = array('faq', 'reference', 'security', 'chapters', 'appendices');
+$parse_dirs = array('faq', 'reference', 'security', 'chapters', 'appendices', 
'language');
 
 $top_files = array('installpart.xml', 'manual.xml');
 
@@ -36,7 +36,7 @@
     readdir($d); readdir($d);
 
     while (($f = readdir($d))) {
-        if ($f == 'functions.xml' || $f == 'CVS' || $f == '.cvsignore') {
+        if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' || $f == 
'.cvsignore') {
             continue;
         }
         switch (filetype($path . '/' .  $f)) {
@@ -49,6 +49,7 @@
                             $docbook_id = 'function.' . substr($f, 0, -4);
                         }
                         break;
+                    case 'language' :
                     case 'faq':
                     case 'security' :
                         $docbook_id = $section . '.' . substr($f, 0, -4);
http://cvs.php.net/diff.php/livedocs/mkindex.php?r1=1.27&r2=1.28&ty=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.27 livedocs/mkindex.php:1.28
--- livedocs/mkindex.php:1.27   Sat Mar 20 13:52:17 2004
+++ livedocs/mkindex.php        Sun Mar 21 05:45:15 2004
@@ -19,7 +19,7 @@
 // | construct an index                                                   |
 // +----------------------------------------------------------------------+
 //
-// $Id: mkindex.php,v 1.27 2004/03/20 18:52:17 didou Exp $
+// $Id: mkindex.php,v 1.28 2004/03/21 10:45:15 nlopess Exp $
 
 
 /* just to be on the safe side */
@@ -252,7 +252,7 @@
                if (is_dir($full)) {
                        scan_dir($full, $relname);
                } else if (substr($f, -4) == '.xml') {
-                       if ($f != 'functions.xml' || $relname == 
'language/functions.xml') { 
+                       if ($f != 'functions.xml' || $relname == 'language' . 
DIRECTORY_SEPARATOR . 'functions.xml' ) { 
                                $files[$f] = $full;
                                parse_file($full, $relname, $dirid);
                        }