Commit b13fba7e authored by Michael Moss's avatar Michael Moss Committed by Commit Bot

Allow bools in gclient recipe custom_vars.

This has been supported in gclient, and used in DEPS, since
https://crrev.com/c/687496.

R=dpranke@google.com, iannucci@google.com

Bug: 570091,807318
Change-Id: I59935625e3bae6010a371ad7bb1413e177a09176
Reviewed-on: https://chromium-review.googlesource.com/896835Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
parent ce9f17f5
...@@ -23,7 +23,7 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None, ...@@ -23,7 +23,7 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
hidden=False), hidden=False),
managed = Single(bool, empty_val=True, required=False, hidden=False), managed = Single(bool, empty_val=True, required=False, hidden=False),
custom_deps = Dict(value_type=(basestring, types.NoneType)), custom_deps = Dict(value_type=(basestring, types.NoneType)),
custom_vars = Dict(value_type=basestring), custom_vars = Dict(value_type=(basestring, types.BooleanType)),
safesync_url = Single(basestring, required=False), safesync_url = Single(basestring, required=False),
revision = Single( revision = Single(
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"env": { "env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"env": { "env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"env": { "env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config", "config",
"--spec", "--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
], ],
"env": { "env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
......
...@@ -51,6 +51,7 @@ def RunSteps(api): ...@@ -51,6 +51,7 @@ def RunSteps(api):
soln.name = 'src' soln.name = 'src'
soln.url = 'https://chromium.googlesource.com/chromium/src.git' soln.url = 'https://chromium.googlesource.com/chromium/src.git'
soln.revision = api.properties.get('revision') soln.revision = api.properties.get('revision')
soln.custom_vars = {'string_var': 'string_val', 'true_var': True}
src_cfg.parent_got_revision_mapping['parent_got_revision'] = 'got_revision' src_cfg.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
api.gclient.c = src_cfg api.gclient.c = src_cfg
api.gclient.checkout() api.gclient.checkout()
......
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