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

[SofaHelper] FIX Windows relative path from runSofa #568

Merged
merged 4 commits into from
Jan 25, 2018
Merged

[SofaHelper] FIX Windows relative path from runSofa #568

merged 4 commits into from
Jan 25, 2018

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Jan 19, 2018 •
edited
Loading

Fixes #561

This PR does the same work as #564 but using the existing Utils::getSofaPathPrefix() function and avoiding heavy macro creation in root CMakelists.
I also removed all the PluginRepository and DataRepository re-inits.

Sorry @ErwanDouaille I did not know this function before :-/

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
[SofaHelper] ADD Utils::getSofaPathTo
77ebe7f 
Uses Utils::getSofaPathPrefix + <path> to avoid repetitive string concats
@guparan
[SofaHelper] FIX PluginRepository init
13f248b 
Init was wrong on Windows for Visual Studio build dirs like bin/Release or bin/Debug/x64
@guparan
[SofaGuiQt] FIX GuiDataRepository init
bbe2464 
Init was wrong on Windows for Visual Studio build dirs like bin/Release or bin/Debug/x64
@guparan
[all] REMOVE PluginRepository inits all around SOFA
5dad27f 
PluginRepository and DataRepository are init in FileRepository.cpp ONLY.
There is no need to reinit them or to use addFirstPath with the defaults: see FileRepository.cpp
@guparan guparan changed the title Fix relative path windows [SofaKernel] FIX Windows relative path from runSofa Jan 19, 2018
@guparan guparan added pr: fix Fix a bug pr: clean Cleaning the code labels Jan 19, 2018
@guparan guparan requested a review from ErwanDouaille January 19, 2018 14:26
@guparan guparan added the pr: status to review To notify reviewers to review this pull-request label Jan 19, 2018
@ErwanDouaille ErwanDouaille mentioned this pull request Jan 19, 2018
Closed
6 tasks
@ErwanDouaille
Copy link
Contributor

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

@guparan guparan added this to the v17.12 milestone Jan 22, 2018
@guparan
Copy link
Contributor Author

guparan commented Jan 22, 2018

This PR seems ready.

@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 Jan 24, 2018
@hugtalbot hugtalbot merged commit 70212c0 into sofa-framework:master Jan 25, 2018
@guparan guparan changed the title [SofaKernel] FIX Windows relative path from runSofa [SofaHelper] FIX Windows relative path from runSofa Jan 25, 2018
@margaretkoehler margaretkoehler mentioned this pull request Jan 25, 2018
Closed
@guparan guparan deleted the fix_relative_path_windows branch February 19, 2018 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ErwanDouaille ErwanDouaille Awaiting requested review from ErwanDouaille

Assignees
No one assigned
Labels
pr: clean Cleaning the code pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v17.12
Development

Successfully merging this pull request may close these issues.

windows 10 many files not found
3 participants
@guparan @ErwanDouaille @hugtalbot