diff options
author | scottmg <scottmg@chromium.org> | 2014-12-01 16:25:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-02 00:25:35 +0000 |
commit | b199254f481c5db36d56e83fce40594b06d2b81f (patch) | |
tree | 750cbec5b7f5e15d78cddb158b856012a20f49c5 /build/json_schema_api.gni | |
parent | fb49bffb2e0bd0f9a9e0ee5982d6a0ecf5b1dc6f (diff) | |
download | chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.zip chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.tar.gz chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.tar.bz2 |
gn format //build
A starting point for doing all of src, and adding a PRESUBMIT.
Includes https://codereview.chromium.org/772663002/ and https://codereview.chromium.org/770053002/.
I haven't pushed new binaries yet.
Generated via:
> cd build
> git ls-files *.gn *.gni | sed -e "s/^/@..\\\\out\\\\Debug\\\\gn format --in-place /" >x.bat && x.bat
The only things that I don't love in the current output are:
1. Turning
args = [
"--depfile", rebase_path(depfile, root_build_dir),
"--android-sdk-tools", rebased_android_sdk_build_tools,
"--dex-path", rebased_output,
]
into:
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
"--android-sdk-tools",
rebased_android_sdk_build_tools,
"--dex-path",
rebased_output,
]
The heuristic for this isn't trivial though, and it also affects e.g. '-Xclang' in cflags, as well
as assignments to temporaries that are later assigned to args.
2. Turning single line
if (defined(invoker.inputs)) { inputs = invoker.inputs }
into
if (defined(invoker.inputs)) {
inputs = invoker.inputs
}
This could be argued to be an improvement, but as it's very boilerplate-y perhaps an exception to
allow single line in this case is worthwhile. I think there was discussion of new syntax for this
case too, something like "inputs ?= invoker.inputs" maybe.
In both cases, I think it's worthwhile to get formatting turned on, and then go back and special
case these if we decide it's worthwhile.
R=brettw@chromium.org
BUG=348474
Review URL: https://codereview.chromium.org/766573003
Cr-Commit-Position: refs/heads/master@{#306305}
Diffstat (limited to 'build/json_schema_api.gni')
-rw-r--r-- | build/json_schema_api.gni | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/build/json_schema_api.gni b/build/json_schema_api.gni index 5857739..dd8ab92 100644 --- a/build/json_schema_api.gni +++ b/build/json_schema_api.gni @@ -57,8 +57,8 @@ template("json_schema_api") { schemas = defined(invoker.schemas) && invoker.schemas bundle = defined(invoker.bundle) && invoker.bundle - bundle_registration = defined(invoker.bundle_registration) && - invoker.bundle_registration + bundle_registration = + defined(invoker.bundle_registration) && invoker.bundle_registration schema_include_rules = "" if (defined(invoker.schema_include_rules)) { @@ -108,11 +108,15 @@ template("json_schema_api") { "--destdir=" + rebase_path(root_gen_dir, root_build_dir), "--namespace=$root_namespace", "--generator=cpp", - "--include-rules=$schema_include_rules" ] + "--include-rules=$schema_include_rules", + ] if (defined(invoker.visibility)) { # If visibility is restricted, add our own target to it. - visibility = [ invoker.visibility, target_visibility ] + visibility = [ + invoker.visibility, + target_visibility, + ] } } } @@ -120,7 +124,7 @@ template("json_schema_api") { if (bundle) { uncompiled_sources = [] if (defined(invoker.uncompiled_sources)) { - uncompiled_sources = invoker.uncompiled_sources + uncompiled_sources = invoker.uncompiled_sources } bundle_generator_schema_name = target_name + "_bundle_generator_schema" @@ -132,28 +136,28 @@ template("json_schema_api") { "$target_gen_dir/generated_schemas.h", ] args = [ - "--root=" + rebase_path("//", root_build_dir), - "--destdir=" + rebase_path(root_gen_dir, root_build_dir), - "--namespace=$root_namespace", - "--generator=cpp-bundle-schema", - "--include-rules=$schema_include_rules" ] - + rebase_path(sources, root_build_dir) - + rebase_path(uncompiled_sources, root_build_dir) + "--root=" + rebase_path("//", root_build_dir), + "--destdir=" + rebase_path(root_gen_dir, root_build_dir), + "--namespace=$root_namespace", + "--generator=cpp-bundle-schema", + "--include-rules=$schema_include_rules", + ] + rebase_path(sources, root_build_dir) + + rebase_path(uncompiled_sources, root_build_dir) } } if (bundle_registration) { uncompiled_sources = [] if (defined(invoker.uncompiled_sources)) { - uncompiled_sources = invoker.uncompiled_sources + uncompiled_sources = invoker.uncompiled_sources } assert(defined(invoker.impl_dir), "\"impl_dir\" must be defined for the $target_name template.") impl_dir = invoker.impl_dir - bundle_generator_registration_name = target_name + - "_bundle_generator_registration" + bundle_generator_registration_name = + target_name + "_bundle_generator_registration" action(bundle_generator_registration_name) { script = compiler_script inputs = compiler_sources + sources + uncompiled_sources @@ -162,14 +166,14 @@ template("json_schema_api") { "$root_gen_dir/$impl_dir/generated_api_registration.h", ] args = [ - "--root=" + rebase_path("//", root_build_dir), - "--destdir=" + rebase_path(root_gen_dir, root_build_dir), - "--namespace=$root_namespace", - "--generator=cpp-bundle-registration", - "--impl-dir=" + rebase_path(impl_dir, "//"), - "--include-rules=$schema_include_rules" ] - + rebase_path(sources, root_build_dir) - + rebase_path(uncompiled_sources, root_build_dir) + "--root=" + rebase_path("//", root_build_dir), + "--destdir=" + rebase_path(root_gen_dir, root_build_dir), + "--namespace=$root_namespace", + "--generator=cpp-bundle-registration", + "--impl-dir=" + rebase_path(impl_dir, "//"), + "--include-rules=$schema_include_rules", + ] + rebase_path(sources, root_build_dir) + + rebase_path(uncompiled_sources, root_build_dir) } } |