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.

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

[All] v19.12 changes + DocBrowser by Defrost #1275

Merged
merged 171 commits into from
Mar 31, 2020

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Mar 17, 2020

This PRs regroups 2 works:

1. Changes for v19.12 packaging

  • Qt deployment using windeployqt/macdeployqt and post-install scripts
  • Improvement of post-install scripts (Linux and MacOS)
  • MacOS packaging with latest CMake
  • Better param names for macros sofa_install_libraries and sofa_copy_libraries

2. Integration of DocBrowser by Defrost

  • New Qt dependencies (required): WebEngine + WebEngineWidgets
    WARNING: this will definitely break VS2015 compatibility

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.

damienmarchal and others added 30 commits January 11, 2018 16:47
# Conflicts:
#	applications/sofa/gui/qt/panels/QDocBrowser.cpp
The code is automatically adding an alignedbox if nothing is provided in
the constructor. This kind of test make no sense in the constructor as
the "isSet" is sure to be set to false. The test should go in init or reinit.

This commit fix that.
… similar with the one from python.array

This is breaking but as this is a recently added function made by me I hope no one is still using it.
…th query instead of exception

This behavior is similar to the getChild one.
This is a very annoying behavior when working with the -i option.
…_info("RequiredPlugin")

The string based version is there for non component only message.
For component it is much better to use the msg_info(this) or msg_info() version
that add the messge in the backlog of the component.
…e comments.

Constraint are used only for contact so the help text was misleading.
Are constraints are used for much more than contact mangement.
The checking is now done in "init". This allows to create and add a ForceField
into a a not yet finished tree while validity is checked later (at init())
@guparan guparan added enhancement About a possible enhancement pr: breaking Change possibly inducing a compilation error pr: status to review To notify reviewers to review this pull-request labels Mar 17, 2020
@hugtalbot
Copy link
Contributor

Corona-efficiency ! Well done !

@damienmarchal
Copy link
Contributor

OUch :)

@hugtalbot
Copy link
Contributor

then ready

@guparan
Copy link
Contributor Author

guparan commented Mar 25, 2020

[ci-build][with-all-tests]

@hugtalbot hugtalbot 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 25, 2020
@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status ready Approved a pull-request, ready to be squashed labels Mar 25, 2020
@guparan
Copy link
Contributor Author

guparan commented Mar 25, 2020

@guparan
Copy link
Contributor Author

guparan commented Mar 30, 2020

Errors are fixed. Ready to merge! 🎉

@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 30, 2020
@hugtalbot hugtalbot merged commit 1831804 into sofa-framework:master Mar 31, 2020
@guparan guparan added this to the v20.06 milestone Jun 16, 2020
bakpaul pushed a commit to bakpaul/sofa that referenced this pull request Feb 23, 2024
[All] v19.12 changes + DocBrowser by Defrost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement About a possible enhancement pr: breaking Change possibly inducing a compilation error pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants