Skip to content
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

Jump to bottom

[CMake] Remove COMPONENTSET, keep DEPRECATED #586

Merged
merged 13 commits into from
Mar 12, 2018
Merged

[CMake] Remove COMPONENTSET, keep DEPRECATED #586

merged 13 commits into from
Mar 12, 2018

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Feb 8, 2018 •
edited
Loading

This PR removes the COMPONENTSET mechanism from our CMakeLists.
Deprecated components are now identified by the option SOFA_WITH_DEPRECATED_COMPONENTS.

I also couldn't resist to reformat a bit. Tell me if I did something wrong!

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@guparan guparan added pr: status to review To notify reviewers to review this pull-request pr: clean Cleaning the code labels Feb 8, 2018
@guparan guparan requested a review from bcarrez February 8, 2018 14:47
@guparan
Copy link
Contributor Author

guparan commented Feb 9, 2018

[ci-build][with-scene-tests]

@guparan
Copy link
Contributor Author

guparan commented Feb 14, 2018

Will try a build on CI with SOFA_WITH_DEPRECATED_COMPONENTS=OFF

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Feb 14, 2018
@guparan
Copy link
Contributor Author

guparan commented Feb 14, 2018

Here we go, let's try to [ci-build][with-scene-tests]

@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Feb 14, 2018
@guparan
Copy link
Contributor Author

guparan commented Feb 15, 2018 •
edited
Loading

Build fails because of a dependency from MouseOperations to multiple deprecated components in SofaUserInteraction.
Any clue on this component guys?
@damienmarchal @fredroy @ErwanDouaille @epernod

@guparan
[SofaFramework] Replace build_option_componentset.h.in
b0ec93d 
by build_option_deprecated_components.h.in
@guparan
[SofaUserInteraction] REVERT deprecations
14c1f7a 
These components are needed by MouseOperations:
- AddRecordedCameraPerformer
- FixParticlePerformer
- InciseAlongPathPerformer
- RemovePrimitivePerformer
- StartNavigationPerformer
- SuturePointPerformer
@guparan
Merge remote-tracking branch 'sofa-framework/master' into revert_comp…
1acecd7 
…onentset
@guparan guparan force-pushed the revert_componentset branch from a11e824 to 1acecd7 Compare February 15, 2018 15:50
@guparan
Copy link
Contributor Author

guparan commented Feb 21, 2018

TODO: add file for deprecated components, SceneChecker will read this file.
Back to wip.

@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Feb 21, 2018
@guparan
[SofaHelper] Rename deprecatedcomponents to deprecated
2dcb4f6 
and update deprecated components list
@guparan
[tools] ADD SofaDeprecatedComponents
6462b34 
SofaDeprecatedComponents is a simple executable that reads the map sofa::helper::deprecated::components and outputs all components.
It will be used by SOFA CI scripts to avoid testing scenes that contain deprecated components.
WARNING: the map needs to be up-to-date!
@guparan
[SofaHelper] EDIT deprecated components API
661d760
@guparan
[SofaHelper] RENAME deprecated to ComponentChange
42f1baa
@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Mar 6, 2018
@guparan
Copy link
Contributor Author

guparan commented Mar 7, 2018

@damienmarchal Could you have a look at my recent commits (particularly 661d760) please?
[ci-build][with-scene-tests]

@damienmarchal
Copy link
Contributor

damienmarchal commented Mar 7, 2018 •
edited
Loading

Hi @guparan everything looks fine to me except that I disagree with having sofa code in tools/ :)

Because to me tools/ is just there to hold external tools that are not compiled from sofa code.
Some utilitary code should be in SofaKernel/Framework/Simulation/Module
While application build on top of Sofa should be in applications :)

@guparan
Copy link
Contributor Author

guparan commented Mar 7, 2018 •
edited
Loading

Understood, I'll move it to applications/projects :-)

EDIT: Then SofaGTestMain should be moved too.

@guparan
[SofaDeprecatedComponents] Move to projects + rename + clean
45ec2cb 
tools/SofaDeprecatedComponents -> applications/projects/getDeprecatedComponents
@guparan
Copy link
Contributor Author

guparan commented Mar 7, 2018

Here we go!

@guparan
[scripts/ci] Keep deprecated components for now
869122f 
SOFA_WITH_DEPRECATED_COMPONENTS will be disabled when we will be able to ignore scenes containing deprecated components.
@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Mar 12, 2018
@hugtalbot hugtalbot merged commit 074dacf into sofa-framework:master Mar 12, 2018
@guparan guparan added this to the v18.06 milestone Apr 5, 2018
@guparan guparan deleted the revert_componentset branch April 27, 2018 07:44
guparan pushed a commit to guparan/sofa that referenced this pull request May 25, 2018
@hugtalbot
Merge pull request sofa-framework#586 from guparan/revert_componentset
2c0a9ec 
[CMake] Remove COMPONENTSET, keep DEPRECATED
@guparan guparan mentioned this pull request Jun 4, 2018
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bcarrez bcarrez Awaiting requested review from bcarrez

Assignees

@bcarrez bcarrez

Labels
pr: clean Cleaning the code pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v18.06
Development

Successfully merging this pull request may close these issues.
4 participants
@guparan @damienmarchal @hugtalbot @bcarrez