feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Allow passing custom project configuration options to `platformio ci and platformio init commands using -O, --project-option`.

Browse Source
This commit is contained in:
Ivan Kravets
2016-09-01 15:14:38 +03:00
parent c51ac0489f
commit 838063b1b7
5 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platformio/commands/ci.py
View File

@@ -68,6 +68,7 @@ def validate_path(ctx, param, value): # pylint: disable=unused-argument
resolve_path=True))
@click.option("--keep-build-dir", is_flag=True)
@click.option(
"-C",
"--project-conf",
type=click.Path(
exists=True,
@@ -75,6 +76,7 @@ def validate_path(ctx, param, value): # pylint: disable=unused-argument
dir_okay=False,
readable=True,
resolve_path=True))
@click.option("-O", "--project-option", multiple=True)
@click.option("-v", "--verbose", is_flag=True)
@click.pass_context
def cli(ctx, # pylint: disable=R0913
@@ -85,6 +87,7 @@ def cli(ctx, # pylint: disable=R0913
build_dir,
keep_build_dir,
project_conf,
project_option,
verbose):
if not src and getenv("PLATFORMIO_CI_SRC"):
@@ -113,7 +116,11 @@ def cli(ctx, # pylint: disable=R0913
_exclude_contents(build_dir, exclude)
# initialise project
ctx.invoke(cmd_init, project_dir=build_dir, board=board)
ctx.invoke(
cmd_init,
project_dir=build_dir,
board=board,
project_option=project_option)
# process project
ctx.invoke(cmd_run, project_dir=build_dir, verbose=verbose)

14
platformio/commands/init.py
View File

@@ -58,14 +58,14 @@ def validate_boards(ctx, param, value): # pylint: disable=W0613
"-b", "--board", multiple=True, metavar="ID", callback=validate_boards)
@click.option(
"--ide", type=click.Choice(ProjectGenerator.get_supported_ides()))
@click.option("--enable-auto-uploading", is_flag=True)
@click.option("-O", "--project-option", multiple=True)
@click.option("--env-prefix", default="")
@click.pass_context
def cli(ctx, # pylint: disable=R0913
project_dir,
board,
ide,
enable_auto_uploading,
project_option,
env_prefix):
if project_dir == getcwd():
@@ -92,8 +92,8 @@ def cli(ctx, # pylint: disable=R0913
init_base_project(project_dir)
if board:
fill_project_envs(ctx, project_dir, board, enable_auto_uploading,
env_prefix, ide is not None)
fill_project_envs(ctx, project_dir, board, project_option, env_prefix,
ide is not None)
if ide:
if not board:
@@ -288,7 +288,7 @@ def init_cvs_ignore(project_dir):
def fill_project_envs( # pylint: disable=too-many-arguments,too-many-locals
ctx, project_dir, board_ids, enable_auto_uploading, env_prefix,
ctx, project_dir, board_ids, project_option, env_prefix,
force_download):
installed_boards = PlatformManager().get_installed_boards()
content = []
@@ -327,8 +327,8 @@ def fill_project_envs( # pylint: disable=too-many-arguments,too-many-locals
content.append("framework = %s" % frameworks[0])
content.append("board = %s" % id_)
if enable_auto_uploading:
content.append("targets = upload")
if project_option:
content.extend(project_option)
if force_download and used_platforms:
_install_dependent_platforms(ctx, used_platforms)