Skip to content

Commit

Permalink
Fix recursion on io_conversion help directions
Browse files Browse the repository at this point in the history
Bug: crbug.com/gn/74
Change-Id: Id8106aa90b2326082ab96530d5e078ee4d1c6a2c
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/4940
Reviewed-by: Brett Wilson <[email protected]>
Commit-Queue: Julie Hockett <[email protected]>
  • Loading branch information
Julie Hockett authored and Commit Bot committed May 14, 2019
1 parent 73e8907 commit 81ee196
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docs/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@
* [dotfile: Info about the toplevel .gn file.](#dotfile)
* [execution: Build graph and execution overview.](#execution)
* [grammar: Language and grammar for GN build files.](#grammar)
* [input_conversion: Processing input from exec_script and read_file.](#input_conversion)
* [input_conversion: Processing input from exec_script and read_file.](#io_conversion)
* [label_pattern: Matching more than one label.](#label_pattern)
* [labels: About labels.](#labels)
* [ninja_rules: How Ninja build rules are named.](#ninja_rules)
* [nogncheck: Annotating includes for checking.](#nogncheck)
* [output_conversion: Specifies how to transform a value to output.](#output_conversion)
* [output_conversion: Specifies how to transform a value to output.](#io_conversion)
* [runtime_deps: How runtime dependency computation works.](#runtime_deps)
* [source_expansion: Map sources to outputs for scripts.](#source_expansion)
* [switches: Show available command-line switches.](#switch_list)
Expand Down Expand Up @@ -2052,7 +2052,7 @@
unspecified or the empty list which means no arguments.
input_conversion:
Controls how the file is read and parsed. See "gn help input_conversion".
Controls how the file is read and parsed. See "gn help io_conversion".
If unspecified, defaults to the empty string which causes the script
result to be discarded. exec script will return None.
Expand Down Expand Up @@ -2596,7 +2596,7 @@
Filename to read, relative to the build file.
input_conversion
Controls how the file is read and parsed. See "gn help input_conversion".
Controls how the file is read and parsed. See "gn help io_conversion".
```

#### **Example**
Expand Down Expand Up @@ -3693,7 +3693,7 @@
The list or string to write.
output_conversion
Controls how the output is written. See "gn help output_conversion".
Controls how the output is written. See "gn help io_conversion".
```
## <a name="predefined_variables"></a>Built-in predefined variables

Expand Down Expand Up @@ -5210,7 +5210,7 @@

```
Controls how the "contents" of a generated_file target is formatted.
See "gn help output_conversion".
See "gn help io_conversion".
```
### <a name="var_output_dir"></a>**output_dir**: [directory] Directory to put output file in.

Expand Down
4 changes: 2 additions & 2 deletions tools/gn/command_help.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void PrintToplevelHelp() {
"grammar");
PrintShortHelp(
"input_conversion: Processing input from exec_script and read_file.",
"input_conversion");
"io_conversion");
PrintShortHelp("label_pattern: Matching more than one label.",
"label_pattern");
PrintShortHelp("labels: About labels.", "labels");
Expand All @@ -88,7 +88,7 @@ void PrintToplevelHelp() {
PrintShortHelp("nogncheck: Annotating includes for checking.", "nogncheck");
PrintShortHelp(
"output_conversion: Specifies how to transform a value to output.",
"output_conversion");
"io_conversion");
PrintShortHelp("runtime_deps: How runtime dependency computation works.",
"runtime_deps");
PrintShortHelp("source_expansion: Map sources to outputs for scripts.",
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/function_exec_script.cc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const char kExecScript_Help[] =
unspecified or the empty list which means no arguments.
input_conversion:
Controls how the file is read and parsed. See "gn help input_conversion".
Controls how the file is read and parsed. See "gn help io_conversion".
If unspecified, defaults to the empty string which causes the script
result to be discarded. exec script will return None.
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/function_read_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Arguments
Filename to read, relative to the build file.
input_conversion
Controls how the file is read and parsed. See "gn help input_conversion".
Controls how the file is read and parsed. See "gn help io_conversion".
Example
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/function_write_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Arguments
The list or string to write.
output_conversion
Controls how the output is written. See "gn help output_conversion".
Controls how the output is written. See "gn help io_conversion".
)";

Value RunWriteFile(Scope* scope,
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/variables.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2065,7 +2065,7 @@ const char kWriteOutputConversion_Help[] =
R"("output_conversion: Data format for generated_file targets.
Controls how the "contents" of a generated_file target is formatted.
See "gn help output_conversion".
See "gn help io_conversion".
)";

const char kWriteRuntimeDeps[] = "write_runtime_deps";
Expand Down

0 comments on commit 81ee196

Please sign in to comment.