From 853838a322610efa01db0917b76e0aeac65e68ba Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 6 Sep 2019 16:06:11 +0100 Subject: [PATCH] docs: Remove GENERATE_MAN support from Doxyfile Also remove redundant sections from the config file that all relate to features that are unconditionally disabled for us and by default. They were all no-ops because the corresponding "GENERATE_"- config is NO by default as well. Per . Bug: T232104 Change-Id: Ibd81f23922f1994be6579fcd8e1ece5e9f995905 --- maintenance/Doxyfile | 57 ---------------------------------------- maintenance/mwdocgen.php | 4 --- 2 files changed, 61 deletions(-) diff --git a/maintenance/Doxyfile b/maintenance/Doxyfile index dcd147f459..1a5daca4e1 100644 --- a/maintenance/Doxyfile +++ b/maintenance/Doxyfile @@ -236,63 +236,6 @@ SEARCHDATA_FILE = searchdata.xml EXTERNAL_SEARCH_ID = EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- -# Configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -LATEX_FOOTER = -LATEX_EXTRA_FILES = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -LATEX_SOURCE_CODE = NO -LATEX_BIB_STYLE = plain -#--------------------------------------------------------------------------- -# Configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# Configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = {{GENERATE_MAN}} -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# Configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# Configuration options related to the DOCBOOK output -#--------------------------------------------------------------------------- -GENERATE_DOCBOOK = NO -DOCBOOK_OUTPUT = docbook -#--------------------------------------------------------------------------- -# Configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# Configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index e2c262951c..4a50cc5773 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -56,8 +56,6 @@ class MWDocGen extends Maintenance { $this->addOption( 'version', 'Pass a MediaWiki version', false, true ); - $this->addOption( 'generate-man', - 'Whether to generate man files' ); $this->addOption( 'file', "Only process given file or directory. Multiple values " . "accepted with comma separation. Path relative to \$IP.", @@ -109,7 +107,6 @@ class MWDocGen extends Maintenance { } $this->doDot = shell_exec( 'which dot' ); - $this->doMan = $this->hasOption( 'generate-man' ); } public function execute() { @@ -134,7 +131,6 @@ class MWDocGen extends Maintenance { '{{EXCLUDE}}' => $exclude, '{{EXCLUDE_PATTERNS}}' => $excludePatterns, '{{HAVE_DOT}}' => $this->doDot ? 'YES' : 'NO', - '{{GENERATE_MAN}}' => $this->doMan ? 'YES' : 'NO', '{{INPUT_FILTER}}' => $this->inputFilter, ] ); -- 2.20.1