Krinkle has submitted this change and it was merged. Change subject: Remove svnstat stuff used in Doxygen generation ......................................................................
Remove svnstat stuff used in Doxygen generation Change-Id: I9d8db5fae6e0c99d59fcb9a43d7ed4aab953c300 --- M maintenance/Doxyfile M maintenance/mwdocgen.php 2 files changed, 5 insertions(+), 36 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile index b60a196..e3ba4e5 100644 --- a/maintenance/Doxyfile +++ b/maintenance/Doxyfile @@ -5,7 +5,6 @@ # {{OUTPUT_DIRECTORY}} # {{CURRENT_VERSION}} # {{STRIP_FROM_PATH}} -# {{SVNSTAT}} # {{INPUT}} # # To generate documentation run: php mwdocgen.php --no-extensions @@ -114,7 +113,7 @@ SHOW_DIRECTORIES = YES SHOW_FILES = YES SHOW_NAMESPACES = NO -FILE_VERSION_FILTER = {{SVNSTAT}} +FILE_VERSION_FILTER = LAYOUT_FILE = CITE_BIB_FILES = #--------------------------------------------------------------------------- @@ -174,7 +173,6 @@ *.MM \ *.PY RECURSIVE = YES -EXCLUDE = {{EXCLUDE}} EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = LocalSettings.php AdminSettings.php StartProfiler.php .svn */.git/* {{EXCLUDE_PATTERNS}} EXCLUDE_SYMBOLS = diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index 583249a..e36674e 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -60,9 +60,6 @@ /** doxygen input filter to tweak source file before they are parsed */ $doxygenInputFilter = "php {$mwPath}maintenance/mwdoc-filter.php"; -/** svnstat command, used to get the version of each file */ -$svnstat = $mwPath . 'bin/svnstat'; - /** where Phpdoc should output documentation */ $doxyOutput = $mwPath . 'docs' . DIRECTORY_SEPARATOR ; @@ -105,30 +102,11 @@ } /** - * Copied from SpecialVersion::getSvnRevision() - * @param $dir String - * @return Mixed: string or false - */ -function getSvnRevision( $dir ) { - // http://svnbook.red-bean.com/nightly/en/svn.developer.insidewc.html - $entries = $dir . '/.svn/entries'; - - if ( !file_exists( $entries ) ) { - return false; - } - - $content = file( $entries ); - - return intval( $content[3] ); -} - -/** * Generate a configuration file given user parameters and return the temporary filename. * @param $doxygenTemplate String: full path for the template. * @param $outputDirectory String: directory where the stuff will be output. * @param $stripFromPath String: path that should be stripped out (usually mediawiki base path). * @param $currentVersion String: Version number of the software - * @param $svnstat String: path to the svnstat file * @param $input String: Path to analyze. * @param $exclude String: Additionals path regex to exclude * @param $excludePatterns String: Additionals path regex to exclude @@ -136,7 +114,7 @@ * @param $doxyGenerateMan Boolean * @return string */ -function generateConfigFile( $doxygenTemplate, $outputDirectory, $stripFromPath, $currentVersion, $svnstat, $input, $exclude, $excludePatterns, $doxyGenerateMan ) { +function generateConfigFile( $doxygenTemplate, $outputDirectory, $stripFromPath, $currentVersion, $input, $exclude, $excludePatterns, $doxyGenerateMan ) { global $doxygenInputFilter; $template = file_get_contents( $doxygenTemplate ); @@ -145,7 +123,6 @@ '{{OUTPUT_DIRECTORY}}' => $outputDirectory, '{{STRIP_FROM_PATH}}' => $stripFromPath, '{{CURRENT_VERSION}}' => $currentVersion, - '{{SVNSTAT}}' => $svnstat, '{{INPUT}}' => $input, '{{EXCLUDE}}' => $exclude, '{{EXCLUDE_PATTERNS}}' => $excludePatterns, @@ -258,20 +235,14 @@ $excludePatterns = 'extensions'; } -$versionNumber = getSvnRevision( $input ); -if ( $versionNumber === false ) { # Not using subversion ? - $svnstat = ''; # Not really useful if subversion not available - # @todo FIXME - $version = 'trunk'; -} else { - $version = "trunk (r$versionNumber)"; -} +// @todo FIXME to work on git +$version = 'master'; // Generate path exclusions $excludedPaths = $mwPath . join( " $mwPath", $mwExcludePaths ); print "EXCLUDE: $excludedPaths\n\n"; -$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath, $version, $svnstat, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan ); +$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath, $version, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan ); $command = $doxygenBin . ' ' . $generatedConf; echo <<<TEXT -- To view, visit https://gerrit.wikimedia.org/r/60829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d8db5fae6e0c99d59fcb9a43d7ed4aab953c300 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_20 Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits