Skip to content

per profile build dirs #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 16, 2018
Merged

per profile build dirs #712

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f31b1b
Create separate build subdirectory for each build profile.
bmcdonnell-ionx Jun 28, 2018
9d857c0
Append profile name to default build dir with underscores, not as sub…
bmcdonnell-ionx Jun 28, 2018
82db73c
Append profile to test build paths, too.
bmcdonnell-ionx Jun 28, 2018
872d231
In build directory name, when build profile is specified, use `-` (in…
bmcdonnell-ionx Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions mbed/mbed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,6 +2433,20 @@ def status_(ignore=False):
status_(ignore)


# Helper function for compile and test subcommands
def _safe_append_profile_to_build_path(build_path, profile):
if profile:
# profile is (or can be) a list, so just get the first element
if not isinstance(profile, basestring):
profile = profile[0]

if profile:
profile_name_without_extension = os.path.splitext(os.path.basename(profile))[0].upper()
build_path += '-' + profile_name_without_extension

return build_path


# Compile command which invokes the mbed OS native build system
@subcommand('compile',
dict(name=['-t', '--toolchain'], help='Compile toolchain. Example: ARM, GCC_ARM, IAR'),
Expand Down Expand Up @@ -2501,6 +2515,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
# Compile as a library (current dir is default)
if not build_path:
build_path = os.path.join(os.path.relpath(program.path, orig_path), program.build_dir, 'libraries', os.path.basename(orig_path), target.upper(), tchain.upper())
build_path = _safe_append_profile_to_build_path(build_path, profile)

popen([python_cmd, '-u', os.path.join(tools_dir, 'build.py')]
+ list(chain.from_iterable(zip(repeat('-D'), macros)))
Expand All @@ -2517,6 +2532,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
# Compile as application (root is default)
if not build_path:
build_path = os.path.join(os.path.relpath(program.path, orig_path), program.build_dir, target.upper(), tchain.upper())
build_path = _safe_append_profile_to_build_path(build_path, profile)

popen([python_cmd, '-u', os.path.join(tools_dir, 'make.py')]
+ list(chain.from_iterable(zip(repeat('-D'), macros)))
Expand Down Expand Up @@ -2598,6 +2614,7 @@ def test_(toolchain=None, target=None, compile_list=False, run_list=False, compi
build_path = build
if not build_path:
build_path = os.path.join(os.path.relpath(program.path, orig_path), program.build_dir, 'tests', target.upper(), tchain.upper())
build_path = _safe_append_profile_to_build_path(build_path, profile)

if test_spec:
# Preserve path to given test spec
Expand Down