forked from Minki/linux
Documentation/sphinx: add support for specifying extra export files
Let the user specify file patterns where to look for the EXPORT_SYMBOLs in addition to the file with kernel-doc comments. This is directly based on the -export-file FILE option added to kernel-doc in "kernel-doc: add support for specifying extra files for EXPORT_SYMBOLs", but we extend that with globbing patterns in the Sphinx extension. The file patterns are added as options to the :export: and :internal: arguments of the kernel-doc directive. For example, to extract the documentation of exported functions from include/net/mac80211.h: .. kernel-doc:: include/net/mac80211.h :export: net/mac80211/*.c Without the file pattern, no exported functions would be found, as the EXPORT_SYMBOLs are placed in the various source files under net/mac80211. The matched files are also added as dependencies on the document in Sphinx, as they may affect the output. This is one of the reasons to do the globbing in the Sphinx extension instead of in scripts/kernel-doc. The file pattern remains optional, and is not needed if the kernel-doc comments and EXPORT_SYMBOLs are placed in the source file passed in as the main argument to the kernel-doc directive. This is the most common case across the kernel source tree. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
057de5c4dd
commit
03d35d9ec4
@ -31,6 +31,7 @@ import os
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
|
import glob
|
||||||
|
|
||||||
from docutils import nodes, statemachine
|
from docutils import nodes, statemachine
|
||||||
from docutils.statemachine import ViewList
|
from docutils.statemachine import ViewList
|
||||||
@ -44,8 +45,8 @@ class KernelDocDirective(Directive):
|
|||||||
option_spec = {
|
option_spec = {
|
||||||
'doc': directives.unchanged_required,
|
'doc': directives.unchanged_required,
|
||||||
'functions': directives.unchanged_required,
|
'functions': directives.unchanged_required,
|
||||||
'export': directives.flag,
|
'export': directives.unchanged,
|
||||||
'internal': directives.flag,
|
'internal': directives.unchanged,
|
||||||
}
|
}
|
||||||
has_content = False
|
has_content = False
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ class KernelDocDirective(Directive):
|
|||||||
cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
|
cmd = [env.config.kerneldoc_bin, '-rst', '-enable-lineno']
|
||||||
|
|
||||||
filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
|
filename = env.config.kerneldoc_srctree + '/' + self.arguments[0]
|
||||||
|
export_file_patterns = []
|
||||||
|
|
||||||
# Tell sphinx of the dependency
|
# Tell sphinx of the dependency
|
||||||
env.note_dependency(os.path.abspath(filename))
|
env.note_dependency(os.path.abspath(filename))
|
||||||
@ -63,14 +65,21 @@ class KernelDocDirective(Directive):
|
|||||||
# FIXME: make this nicer and more robust against errors
|
# FIXME: make this nicer and more robust against errors
|
||||||
if 'export' in self.options:
|
if 'export' in self.options:
|
||||||
cmd += ['-export']
|
cmd += ['-export']
|
||||||
|
export_file_patterns = str(self.options.get('export')).split()
|
||||||
elif 'internal' in self.options:
|
elif 'internal' in self.options:
|
||||||
cmd += ['-internal']
|
cmd += ['-internal']
|
||||||
|
export_file_patterns = str(self.options.get('internal')).split()
|
||||||
elif 'doc' in self.options:
|
elif 'doc' in self.options:
|
||||||
cmd += ['-function', str(self.options.get('doc'))]
|
cmd += ['-function', str(self.options.get('doc'))]
|
||||||
elif 'functions' in self.options:
|
elif 'functions' in self.options:
|
||||||
for f in str(self.options.get('functions')).split():
|
for f in str(self.options.get('functions')).split():
|
||||||
cmd += ['-function', f]
|
cmd += ['-function', f]
|
||||||
|
|
||||||
|
for pattern in export_file_patterns:
|
||||||
|
for f in glob.glob(env.config.kerneldoc_srctree + '/' + pattern):
|
||||||
|
env.note_dependency(os.path.abspath(f))
|
||||||
|
cmd += ['-export-file', f]
|
||||||
|
|
||||||
cmd += [filename]
|
cmd += [filename]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user