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.

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

Correct mbed export with multiple --source params #6143

Merged
merged 2 commits into from Mar 6, 2018

Conversation

Projects
None yet
6 participants
@theotherjimmy
Contributor

theotherjimmy commented Feb 20, 2018

Resolves ARMmbed/mbed-cli#590

What does this allow?

Unusual project structures

I have a project structured like:

fat-fs
├── README.md
└── main.cpp
mbed-os

And I want to export. Using the new configuration available on master of Mbed CLI:

# mbed config MBED_OS_DIR mbed-os
# mbed export -i make_gcc_arm -m k64f --source fat-fs --source mbed-os --build .
# make -j

@theotherjimmy's online compiler testing offline

😄

@0xc0170 0xc0170 changed the title from Correct mbed export with mutliple --source params to Correct mbed export with multiple --source params Feb 21, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Feb 23, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 23, 2018

Build : SUCCESS

Build number : 1228
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6143/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Feb 23, 2018

/morph uvisor-test

1 similar comment
@cmonr

This comment has been minimized.

Contributor

cmonr commented Feb 23, 2018

/morph uvisor-test

@cmonr

This comment has been minimized.

Contributor

cmonr commented Feb 26, 2018

Damn it, it figures this would happen...

@theotherjimmy gonna need a rebase.

@cmonr cmonr added needs: work and removed ready for merge labels Feb 26, 2018

type=argparse_filestring_type,
dest="build_dir",
default=None,
help="The source (input) directory")

This comment has been minimized.

@sarahmarshy

sarahmarshy Feb 28, 2018

Contributor

Is this flag not for the output directory?

This comment has been minimized.

@theotherjimmy

theotherjimmy Feb 28, 2018

Contributor

That's a copy paste error.

@@ -46,7 +46,7 @@ def setup_project(ide, target, program=None, source_dir=None, build=None, export
project_name = TESTS[program]
else:
project_name = basename(normpath(realpath(source_dir[0])))
src_paths = source_dir
src_paths = {relpath(path, project_dir): [path] for path in source_dir}

This comment has been minimized.

@sarahmarshy

sarahmarshy Feb 28, 2018

Contributor

What happens if project_dir gets set to export_path but export_path (build argument) doesn't exist?

This comment has been minimized.

@theotherjimmy

theotherjimmy Feb 28, 2018

Contributor

Relpath will still work correctly. According to the docs; no fs access is done to verify the existence of the path.

This comment has been minimized.

@sarahmarshy

sarahmarshy Feb 28, 2018

Contributor

But what about later when the exporter tries to put files there?

This comment has been minimized.

@sarahmarshy

sarahmarshy Feb 28, 2018

Contributor

I'll just check this out and try it. Give me a bit.

@theotherjimmy theotherjimmy force-pushed the theotherjimmy:multi-source-export branch from 12828f2 to 262c737 Feb 28, 2018

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Feb 28, 2018

@cmonr Rebased.
@sarahmarshy Rebase includes corrections indicated in review.

@cmonr

cmonr approved these changes Feb 28, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Feb 28, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 28, 2018

Build : SUCCESS

Build number : 1305
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6143/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Mar 1, 2018

Waiting on @sarahmarshy for the check.

@cmonr cmonr removed the needs: review label Mar 6, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Mar 6, 2018

Merging since waited several days without hearing back.

@cmonr cmonr merged commit e7fde46 into ARMmbed:master Mar 6, 2018

19 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Local events testing has passed
Details
travis-ci/littlefs Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-RENESAS Local mbed2-RENESAS testing has passed
Details
travis-ci/mbed2-SILICON_LABS Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM Local mbed2-STM testing has passed
Details
travis-ci/tools Local tools testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment