r79070 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79069‎ | r79070 | r79071 >
Date:16:56, 27 December 2010
Author:reedy
Status:ok
Tags:
Comment:
*(bug 26404) Enable call graphs for doxygen-generated doc
Modified paths:
  • /trunk/phase3/maintenance/Doxyfile (modified) (history)
  • /trunk/phase3/maintenance/mwdocgen.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/mwdocgen.php
@@ -1,15 +1,13 @@
22 <?php
33 /**
4 - * Script to easily generate the mediawiki documentation using doxygen.
 4+ * Generate class and file reference documentation for MediaWiki using doxygen.
55 *
6 - * By default it will generate the whole documentation but you will be able to
7 - * generate just some parts.
 6+ * If the dot DOT language processor is available, attempt call graph
 7+ * generation.
88 *
99 * Usage:
1010 * php mwdocgen.php
1111 *
12 - * Then make a selection from the menu
13 - *
1412 * KNOWN BUGS:
1513 *
1614 * - pass_thru seems to always use buffering (even with ob_implicit_flush()),
@@ -46,7 +44,7 @@
4745 #
4846
4947 if ( php_sapi_name() != 'cli' ) {
50 - echo 'Run me from the command line.';
 48+ echo 'Run "' . __FILE__ . '" from the command line.';
5149 die( -1 );
5250 }
5351
@@ -63,7 +61,6 @@
6462 $svnstat = $mwPath . 'bin/svnstat';
6563
6664 /** where Phpdoc should output documentation */
67 -# $doxyOutput = '/var/www/mwdoc/';
6865 $doxyOutput = $mwPath . 'docs' . DIRECTORY_SEPARATOR ;
6966
7067 /** MediaWiki subpaths */
@@ -145,7 +142,7 @@
146143 * @param $currentVersion String: Version number of the software
147144 * @param $svnstat String: path to the svnstat file
148145 * @param $input String: Path to analyze.
149 - * @param $exclude String: Additionals path regex to exlcude
 146+ * @param $exclude String: Additionals path regex to exclude
150147 * (LocalSettings.php, AdminSettings.php, .svn and .git directories are always excluded)
151148 */
152149 function generateConfigFile( $doxygenTemplate, $outputDirectory, $stripFromPath, $currentVersion, $svnstat, $input, $exclude ) {
@@ -160,6 +157,7 @@
161158 '{{SVNSTAT}}' => $svnstat,
162159 '{{INPUT}}' => $input,
163160 '{{EXCLUDE}}' => $exclude,
 161+ '{{HAVE_DOT}}' => `which dot` ? 'YES' : 'NO',
164162 );
165163 $tmpCfg = str_replace( array_keys( $replacements ), array_values( $replacements ), $template );
166164 $tmpFileName = tempnam( wfTempDir(), 'mwdocgen-' );
Index: trunk/phase3/maintenance/Doxyfile
@@ -255,7 +255,7 @@
256256 #---------------------------------------------------------------------------
257257 CLASS_DIAGRAMS = NO
258258 HIDE_UNDOC_RELATIONS = YES
259 -HAVE_DOT = NO
 259+HAVE_DOT = {{HAVE_DOT}}
260260 CLASS_GRAPH = YES
261261 COLLABORATION_GRAPH = YES
262262 GROUP_GRAPHS = YES

Status & tagging log