Skip to content

GitLab

T
tangled
Commit a49b4b6b authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot
Browse files
Options

Fix references to macOS. 

The OS is now called macOS by Apple, so update the
references in the comments and documentation.

Bug: none
Change-Id: Ib4565d6f2a1c218b4efc2118385d4124c10062ea
Reviewed-on: https://chromium-review.googlesource.com/675406
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504668}
parent 77c82741
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
tools/gn/docs/reference.md
View file @ a49b4b6b
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
* [Target declarations](#targets) * [Target declarations](#targets)
* [action: Declare a target that runs a script a single time.](#action) * [action: Declare a target that runs a script a single time.](#action)
* [action_foreach: Declare a target that runs a script over a set of files.](#action_foreach) * [action_foreach: Declare a target that runs a script over a set of files.](#action_foreach)
* [bundle_data: [iOS/OS X] Declare a target without output.](#bundle_data) * [bundle_data: [iOS/macOS] Declare a target without output.](#bundle_data)
* [copy: Declare a target that copies files.](#copy) * [copy: Declare a target that copies files.](#copy)
* [create_bundle: [iOS/OS X] Build an OS X / iOS bundle.](#create_bundle) * [create_bundle: [iOS/macOS] Build an iOS or macOS bundle.](#create_bundle)
* [executable: Declare an executable target.](#executable) * [executable: Declare an executable target.](#executable)
* [group: Declare a named group of targets.](#group) * [group: Declare a named group of targets.](#group)
* [loadable_module: Declare a loadable module target.](#loadable_module) * [loadable_module: Declare a loadable module target.](#loadable_module)
...@@ -1159,7 +1159,7 @@ ...@@ -1159,7 +1159,7 @@
"/{{source_name_part}}.h" ] "/{{source_name_part}}.h" ]
} }
``` ```
### <a name="bundle_data"></a>**bundle_data**: [iOS/OS X] Declare a target without output. ### <a name="bundle_data"></a>**bundle_data**: [iOS/macOS] Declare a target without output.
``` ```
This target type allows to declare data that is required at runtime. It is This target type allows to declare data that is required at runtime. It is
...@@ -1171,8 +1171,8 @@ ...@@ -1171,8 +1171,8 @@
output. The output must reference a file inside of {{bundle_root_dir}}. output. The output must reference a file inside of {{bundle_root_dir}}.
This target can be used on all platforms though it is designed only to This target can be used on all platforms though it is designed only to
generate iOS/OS X bundle. In cross-platform projects, it is advised to put it generate iOS/macOS bundle. In cross-platform projects, it is advised to put it
behind iOS/Mac conditionals. behind iOS/macOS conditionals.
See "gn help create_bundle" for more information. See "gn help create_bundle" for more information.
``` ```
...@@ -1250,10 +1250,10 @@ ...@@ -1250,10 +1250,10 @@
outputs = [ "$target_gen_dir/{{source_file_part}}" ] outputs = [ "$target_gen_dir/{{source_file_part}}" ]
} }
``` ```
### <a name="create_bundle"></a>**create_bundle**: [iOS/OS X] Build an OS X / iOS bundle. ### <a name="create_bundle"></a>**create_bundle**: [ios/macOS] Build an iOS or macOS bundle.
``` ```
This target generates an iOS/OS X bundle (which is a directory with a This target generates an iOS or macOS bundle (which is a directory with a
well-know structure). This target does not define any sources, instead they well-know structure). This target does not define any sources, instead they
are computed from all "bundle_data" target this one depends on transitively are computed from all "bundle_data" target this one depends on transitively
(the recursion stops at "create_bundle" targets). (the recursion stops at "create_bundle" targets).
...@@ -1262,8 +1262,8 @@ ...@@ -1262,8 +1262,8 @@
expansion of {{bundle_*_dir}} rules in "bundle_data" outputs. expansion of {{bundle_*_dir}} rules in "bundle_data" outputs.
This target can be used on all platforms though it is designed only to This target can be used on all platforms though it is designed only to
generate iOS/OS X bundle. In cross-platform projects, it is advised to put it generate iOS or macOS bundle. In cross-platform projects, it is advised to put
behind iOS/Mac conditionals. it behind iOS/macOS conditionals.
If a create_bundle is specified as a data_deps for another target, the bundle If a create_bundle is specified as a data_deps for another target, the bundle
is considered a leaf, and its public and private dependencies will not is considered a leaf, and its public and private dependencies will not
...@@ -1305,7 +1305,7 @@ ...@@ -1305,7 +1305,7 @@
``` ```
# Defines a template to create an application. On most platform, this is just # Defines a template to create an application. On most platform, this is just
# an alias for an "executable" target, but on iOS/OS X, it builds an # an alias for an "executable" target, but on iOS/macOS, it builds an
# application bundle. # application bundle.
template("app") { template("app") {
if (!is_ios && !is_mac) { if (!is_ios && !is_mac) {
...@@ -2754,8 +2754,8 @@ ...@@ -2754,8 +2754,8 @@
"action": Defaults for actions "action": Defaults for actions
Platform specific tools: Platform specific tools:
"copy_bundle_data": [iOS, OS X] Tool to copy files in a bundle. "copy_bundle_data": [iOS, macOS] Tool to copy files in a bundle.
"compile_xcassets": [iOS, OS X] Tool to compile asset catalogs. "compile_xcassets": [iOS, macOS] Tool to compile asset catalogs.
``` ```
#### **Tool variables** #### **Tool variables**
...@@ -3108,7 +3108,7 @@ ...@@ -3108,7 +3108,7 @@
common tool substitutions. common tool substitutions.
The copy_bundle_data and compile_xcassets tools only allows the common tool The copy_bundle_data and compile_xcassets tools only allows the common tool
substitutions. Both tools are required to create iOS/OS X bundles and need substitutions. Both tools are required to create iOS/macOS bundles and need
only be defined on those platforms. only be defined on those platforms.
The copy_bundle_data tool will be called with one source and needs to copy The copy_bundle_data tool will be called with one source and needs to copy
...@@ -4388,7 +4388,7 @@ ...@@ -4388,7 +4388,7 @@
However, no verification is done on these so GN doesn't enforce this. The However, no verification is done on these so GN doesn't enforce this. The
paths are just rebased and passed along when requested. paths are just rebased and passed along when requested.
Note: On iOS and OS X, create_bundle targets will not be recursed into when Note: On iOS and macOS, create_bundle targets will not be recursed into when
gathering data. See "gn help create_bundle" for details. gathering data. See "gn help create_bundle" for details.
See "gn help runtime_deps" for how these are used. See "gn help runtime_deps" for how these are used.
...@@ -4405,7 +4405,7 @@ ...@@ -4405,7 +4405,7 @@
This is normally used for things like plugins or helper programs that a This is normally used for things like plugins or helper programs that a
target needs at runtime. target needs at runtime.
Note: On iOS and OS X, create_bundle targets will not be recursed into when Note: On iOS and macOS, create_bundle targets will not be recursed into when
gathering data_deps. See "gn help create_bundle" for details. gathering data_deps. See "gn help create_bundle" for details.
See also "gn help deps" and "gn help data". See also "gn help deps" and "gn help data".
......
tools/gn/function_toolchain.cc
View file @ a49b4b6b
...@@ -534,8 +534,8 @@ Tool types ...@@ -534,8 +534,8 @@ Tool types
"action": Defaults for actions "action": Defaults for actions
Platform specific tools: Platform specific tools:
"copy_bundle_data": [iOS, OS X] Tool to copy files in a bundle. "copy_bundle_data": [iOS, macOS] Tool to copy files in a bundle.
"compile_xcassets": [iOS, OS X] Tool to compile asset catalogs. "compile_xcassets": [iOS, macOS] Tool to compile asset catalogs.
Tool variables Tool variables
...@@ -886,7 +886,7 @@ R"( The static library ("alink") tool allows {{arflags}} plus the common tool ...@@ -886,7 +886,7 @@ R"( The static library ("alink") tool allows {{arflags}} plus the common tool
common tool substitutions. common tool substitutions.
The copy_bundle_data and compile_xcassets tools only allows the common tool The copy_bundle_data and compile_xcassets tools only allows the common tool
substitutions. Both tools are required to create iOS/OS X bundles and need substitutions. Both tools are required to create iOS/macOS bundles and need
only be defined on those platforms. only be defined on those platforms.
The copy_bundle_data tool will be called with one source and needs to copy The copy_bundle_data tool will be called with one source and needs to copy
......
tools/gn/functions_target.cc
View file @ a49b4b6b
...@@ -253,9 +253,9 @@ Value RunActionForEach(Scope* scope, ...@@ -253,9 +253,9 @@ Value RunActionForEach(Scope* scope,
const char kBundleData[] = "bundle_data"; const char kBundleData[] = "bundle_data";
const char kBundleData_HelpShort[] = const char kBundleData_HelpShort[] =
"bundle_data: [iOS/OS X] Declare a target without output."; "bundle_data: [iOS/macOS] Declare a target without output.";
const char kBundleData_Help[] = const char kBundleData_Help[] =
R"(bundle_data: [iOS/OS X] Declare a target without output. R"(bundle_data: [iOS/macOS] Declare a target without output.
This target type allows to declare data that is required at runtime. It is This target type allows to declare data that is required at runtime. It is
used to inform "create_bundle" targets of the files to copy into generated used to inform "create_bundle" targets of the files to copy into generated
...@@ -266,8 +266,8 @@ const char kBundleData_Help[] = ...@@ -266,8 +266,8 @@ const char kBundleData_Help[] =
output. The output must reference a file inside of {{bundle_root_dir}}. output. The output must reference a file inside of {{bundle_root_dir}}.
This target can be used on all platforms though it is designed only to This target can be used on all platforms though it is designed only to
generate iOS/OS X bundle. In cross-platform projects, it is advised to put it generate iOS/macOS bundle. In cross-platform projects, it is advised to put it
behind iOS/Mac conditionals. behind iOS/macOS conditionals.
See "gn help create_bundle" for more information. See "gn help create_bundle" for more information.
...@@ -318,11 +318,11 @@ Value RunBundleData(Scope* scope, ...@@ -318,11 +318,11 @@ Value RunBundleData(Scope* scope,
const char kCreateBundle[] = "create_bundle"; const char kCreateBundle[] = "create_bundle";
const char kCreateBundle_HelpShort[] = const char kCreateBundle_HelpShort[] =
"create_bundle: [iOS/OS X] Build an OS X / iOS bundle."; "create_bundle: [iOS/macOS] Build an iOS or macOS bundle.";
const char kCreateBundle_Help[] = const char kCreateBundle_Help[] =
R"(create_bundle: [iOS/OS X] Build an OS X / iOS bundle. R"(create_bundle: [ios/macOS] Build an iOS or macOS bundle.
This target generates an iOS/OS X bundle (which is a directory with a This target generates an iOS or macOS bundle (which is a directory with a
well-know structure). This target does not define any sources, instead they well-know structure). This target does not define any sources, instead they
are computed from all "bundle_data" target this one depends on transitively are computed from all "bundle_data" target this one depends on transitively
(the recursion stops at "create_bundle" targets). (the recursion stops at "create_bundle" targets).
...@@ -331,8 +331,8 @@ const char kCreateBundle_Help[] = ...@@ -331,8 +331,8 @@ const char kCreateBundle_Help[] =
expansion of {{bundle_*_dir}} rules in "bundle_data" outputs. expansion of {{bundle_*_dir}} rules in "bundle_data" outputs.
This target can be used on all platforms though it is designed only to This target can be used on all platforms though it is designed only to
generate iOS/OS X bundle. In cross-platform projects, it is advised to put it generate iOS or macOS bundle. In cross-platform projects, it is advised to put
behind iOS/Mac conditionals. it behind iOS/macOS conditionals.
If a create_bundle is specified as a data_deps for another target, the bundle If a create_bundle is specified as a data_deps for another target, the bundle
is considered a leaf, and its public and private dependencies will not is considered a leaf, and its public and private dependencies will not
...@@ -368,7 +368,7 @@ Variables ...@@ -368,7 +368,7 @@ Variables
Example Example
# Defines a template to create an application. On most platform, this is just # Defines a template to create an application. On most platform, this is just
# an alias for an "executable" target, but on iOS/OS X, it builds an # an alias for an "executable" target, but on iOS/macOS, it builds an
# application bundle. # application bundle.
template("app") { template("app") {
if (!is_ios && !is_mac) { if (!is_ios && !is_mac) {
......
tools/gn/variables.cc
View file @ a49b4b6b
...@@ -972,7 +972,7 @@ const char kData_Help[] = ...@@ -972,7 +972,7 @@ const char kData_Help[] =
However, no verification is done on these so GN doesn't enforce this. The However, no verification is done on these so GN doesn't enforce this. The
paths are just rebased and passed along when requested. paths are just rebased and passed along when requested.
Note: On iOS and OS X, create_bundle targets will not be recursed into when Note: On iOS and macOS, create_bundle targets will not be recursed into when
gathering data. See "gn help create_bundle" for details. gathering data. See "gn help create_bundle" for details.
See "gn help runtime_deps" for how these are used. See "gn help runtime_deps" for how these are used.
...@@ -993,7 +993,7 @@ const char kDataDeps_Help[] = ...@@ -993,7 +993,7 @@ const char kDataDeps_Help[] =
This is normally used for things like plugins or helper programs that a This is normally used for things like plugins or helper programs that a
target needs at runtime. target needs at runtime.
Note: On iOS and OS X, create_bundle targets will not be recursed into when Note: On iOS and macOS, create_bundle targets will not be recursed into when
gathering data_deps. See "gn help create_bundle" for details. gathering data_deps. See "gn help create_bundle" for details.
See also "gn help deps" and "gn help data". See also "gn help deps" and "gn help data".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment