alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cmake kconfig: Pass environment variables to confgen.py via a file

Browse Source 
Works around "command line too long" errors when using Windows
and CMake < 3.11

Closes IDF-711
This commit is contained in:
Angus Gratton 2019-06-26 15:56:47 +10:00 committed by Angus Gratton
parent 0c8192f3be
commit 26db058339
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/cmake/kconfig.cmake
View File

@ -123,15 +123,19 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
string(REPLACE ";" " " kconfigs "${kconfigs}") string(REPLACE ";" " " kconfigs "${kconfigs}")
string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}") string(REPLACE ";" " " kconfig_projbuilds "${kconfig_projbuilds}")
# Place the long environment arguments into an input file
# to work around command line length limits for execute_process
# on Windows & CMake < 3.11
configure_file(
"${idf_path}/tools/kconfig_new/confgen.env.in"
"${CMAKE_CURRENT_BINARY_DIR}/confgen.env")
set(confgen_basecommand set(confgen_basecommand
${python} ${idf_path}/tools/kconfig_new/confgen.py ${python} ${idf_path}/tools/kconfig_new/confgen.py
--kconfig ${root_kconfig} --kconfig ${root_kconfig}
--config ${sdkconfig} --config ${sdkconfig}
${defaults_arg} ${defaults_arg}
--env "COMPONENT_KCONFIGS=${kconfigs}" --env-file "${CMAKE_CURRENT_BINARY_DIR}/confgen.env")
--env "COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}"
--env "IDF_CMAKE=y"
--env "IDF_TARGET=${idf_target}")
idf_build_get_property(build_dir BUILD_DIR) idf_build_get_property(build_dir BUILD_DIR)
set(config_dir ${build_dir}/config) set(config_dir ${build_dir}/config)

6
tools/kconfig_new/confgen.env.in Normal file
View File

@ -0,0 +1,6 @@
{
"COMPONENT_KCONFIGS": "${kconfigs}",
"COMPONENT_KCONFIGS_PROJBUILD": "${kconfig_projbuilds}",
"IDF_CMAKE": "y",
"IDF_TARGET": "${idf_target}"
}

8
tools/kconfig_new/confgen.py
View File

@ -198,6 +198,10 @@ def main():
parser.add_argument('--env', action='append', default=[], parser.add_argument('--env', action='append', default=[],
help='Environment to set when evaluating the config file', metavar='NAME=VAL') help='Environment to set when evaluating the config file', metavar='NAME=VAL')
parser.add_argument('--env-file', type=argparse.FileType('r'),
help='Optional file to load environment variables from. Contents '
'should be a JSON object where each key/value pair is a variable.')
args = parser.parse_args() args = parser.parse_args()
for fmt, filename in args.output: for fmt, filename in args.output:
@ -214,6 +218,10 @@ def main():
for name, value in args.env: for name, value in args.env:
os.environ[name] = value os.environ[name] = value
if args.env_file is not None:
env = json.load(args.env_file)
os.environ.update(env)
config = kconfiglib.Kconfig(args.kconfig) config = kconfiglib.Kconfig(args.kconfig)
config.disable_redun_warnings() config.disable_redun_warnings()
config.disable_override_warnings() config.disable_override_warnings()