xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 21:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "kernel-doc: Use c:struct for Sphinx 3.0 and later"

Browse Source 
This reverts commit 152d1967f6.
We will replace the commit with the fix from Linux.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201117165312.118257-16-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-11-17 17:52:58 +01:00
parent a832c9844d
commit 46ae6e8f82
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sphinx/kerneldoc.py
View File

@ -102,7 +102,6 @@ class KernelDocDirective(Directive):
env.note_dependency(os.path.abspath(f)) env.note_dependency(os.path.abspath(f))
cmd += ['-export-file', f] cmd += ['-export-file', f]
cmd += ['-sphinx-version', sphinx.__version__]
cmd += [filename] cmd += [filename]
try: try:

14
scripts/kernel-doc
View File

@ -71,8 +71,6 @@ Output selection (mutually exclusive):
DOC: sections. May be specified multiple times. DOC: sections. May be specified multiple times.
Output selection modifiers: Output selection modifiers:
-sphinx-version VER Generate rST syntax for the specified Sphinx version.
Only works with reStructuredTextFormat.
-no-doc-sections Do not output DOC: sections. -no-doc-sections Do not output DOC: sections.
-enable-lineno Enable output of #define LINENO lines. Only works with -enable-lineno Enable output of #define LINENO lines. Only works with
reStructuredText format. reStructuredText format.
@ -294,7 +292,6 @@ use constant {
}; };
my $output_selection = OUTPUT_ALL; my $output_selection = OUTPUT_ALL;
my $show_not_found = 0; # No longer used my $show_not_found = 0; # No longer used
my $sphinx_version = "0.0"; # if not specified, assume old
my @export_file_list; my @export_file_list;
@ -460,8 +457,6 @@ while ($ARGV[0] =~ m/^--?(.*)/) {
$enable_lineno = 1; $enable_lineno = 1;
} elsif ($cmd eq 'show-not-found') { } elsif ($cmd eq 'show-not-found') {
$show_not_found = 1; # A no-op but don't fail $show_not_found = 1; # A no-op but don't fail
} elsif ($cmd eq 'sphinx-version') {
$sphinx_version = shift @ARGV;
} else { } else {
# Unknown argument # Unknown argument
usage(); usage();
@ -989,16 +984,7 @@ sub output_struct_rst(%) {
my $oldprefix = $lineprefix; my $oldprefix = $lineprefix;
my $name = $args{'type'} . " " . $args{'struct'}; my $name = $args{'type'} . " " . $args{'struct'};
# Sphinx 3.0 and up will emit warnings for "c:type:: struct Foo".
# It wants to see "c:struct:: Foo" (and will add the word 'struct' in
# the rendered output).
if ((split(/\./, $sphinx_version))[0] >= 3) {
my $sname = $name;
$sname =~ s/^struct //;
print "\n\n.. c:struct:: " . $sname . "\n\n";
} else {
print "\n\n.. c:type:: " . $name . "\n\n"; print "\n\n.. c:type:: " . $name . "\n\n";
}
print_lineno($declaration_start_line); print_lineno($declaration_start_line);
$lineprefix = " "; $lineprefix = " ";
output_highlight_rst($args{'purpose'}); output_highlight_rst($args{'purpose'});