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

Online: Include project root path #8660

Merged
merged 2 commits into from Nov 9, 2018

Conversation

Projects
None yet
5 participants
@theotherjimmy
Contributor

theotherjimmy commented Nov 6, 2018

Description

The prior logic assumed that "." would not be added to the include
paths, indicating that the project root would not be added to the
include paths correctly in the online environment ("." would be
incorrect there). This change set started by removing the addition
of ".", and then fixed building from there.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change
Online: Include project root path
### Description

The prior logic assumed that "." would not be added to the include
paths, indicating that the project root would not be added to the
include paths correctly in the online environment ("." would be
incorrect there). This change set started by removing the addition
of "*.", and then fixed building from there.

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Docs update
    [ ] Test update
    [ ] Breaking change

@cmonr cmonr requested a review from ARMmbed/mbed-os-tools Nov 7, 2018

@cmonr cmonr added the needs: review label Nov 7, 2018

@cmonr

cmonr approved these changes Nov 7, 2018

Neat

@cmonr cmonr added needs: CI and removed needs: review labels Nov 7, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Nov 7, 2018

Out of curiosity, why was the prior logic needed to begin with? Seems like this new behavior is more generic to begin with.

@0xc0170

0xc0170 approved these changes Nov 7, 2018

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Nov 7, 2018

@cmonr I think it was using os.path.join, which does not accept 0 arguments, instead of self._sep.join, which does.

@NirSonnenschein

This comment has been minimized.

Contributor

NirSonnenschein commented Nov 8, 2018

/morph build

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 8, 2018

One failure (nothing uploaded to s3, can't locate the exact failure at the moment) - build aborted

@mbed-ci

This comment has been minimized.

mbed-ci commented Nov 8, 2018

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Nov 8, 2018

The true problem, in case you were wondering:

-I -I. -I./cmsis 

-I without an argument will consume -I., which prevents includes from the root. I'll have to investigate why this is happening.

@0xc0170 0xc0170 added needs: work and removed needs: CI labels Nov 8, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Nov 8, 2018

Hmm, would encapsulating the parameters in quotes help, or are you specifically trying to avoid that?

Resources: Compute parents using only header names
### Description

The prior fix made the assumption that you wanted to compute all of the
parents for a give header file going all the way up the path. This is
not true: you probably want to stop when the project stops. We already
keep track of a virtual name within the project, so instead, we compute
parents of the name, and generate the actual location of these files in
your FS as the path. This makes the solution robust offline and online
(I tested it with my local copy of os.mbed.com)

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Docs update
    [ ] Test update
    [ ] Breaking change
@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Nov 8, 2018

@cmonr Good guess, but that would not help much/at all. The problem was computing parents past the project's root directory. I sorted that with the new commit.

@cmonr cmonr added needs: CI rollup PR and removed needs: work labels Nov 8, 2018

@cmonr cmonr referenced this pull request Nov 9, 2018

Merged

Rollup PR: #8686

@cmonr

This comment has been minimized.

Contributor

cmonr commented Nov 9, 2018

Note: This PR is now a part of a rollup PR (#8686).

No further work is needed here, as once that PR is merged, this PR will also be closed and marked as merged.

If any more commits are made in this PR, this PR will remain open and have to go through CI on its own.

@cmonr cmonr merged commit 95e2b07 into ARMmbed:master Nov 9, 2018

14 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARM Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Passed, 547 files (+0 files)
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9182 cycles (-1018 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8372B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment