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

FIX:Matlab path search on macOS #6390

Merged

Conversation

matl-hsk
Copy link
Contributor

@matl-hsk matl-hsk commented Sep 25, 2023

Description

  • fixes creation of the path were matlab is installed on macOS
  • fixes search for latest matlab version

Related Issues
This pull-request fixes issue #6387

Tasks
Add the list of tasks of this PR.

  • Test in macOS
  • Test in Windows
  • Test in Linux

Documentation
No change in documentation.

Additional context
See issue #6387

- fixes creation of the path were matlab is installed on macOS
- fixes search for latest matlab version
@matl-hsk matl-hsk requested a review from nilsjor September 25, 2023 10:58
@matl-hsk matl-hsk requested a review from a team as a code owner September 25, 2023 10:58
Copy link
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some clang-format issues.

src/controller/launcher/webots_controller.c Outdated Show resolved Hide resolved
- Fix clang-formatting
- Simpler "ifndef"-case for error msg
@nilsjor
Copy link
Contributor

nilsjor commented Sep 25, 2023

Whoops I came on and made your review "outdated". Sorry about that...
I though it would be a suggestion like yours, but it became a commit. Anyways, I fixed the clang-format.

I can confirm it works on Windows! Only thing to address is the debug info about the found path (#6390 (comment))

@nilsjor nilsjor requested a review from omichel September 25, 2023 12:34
nilsjor
nilsjor previously approved these changes Sep 25, 2023
src/controller/launcher/webots_controller.c Outdated Show resolved Hide resolved
src/controller/launcher/webots_controller.c Outdated Show resolved Hide resolved
@omichel omichel self-requested a review September 26, 2023 07:39
@matl-hsk
Copy link
Contributor Author

Do you have someone to test it on linux or shall I go ahead and merge?

@omichel
Copy link
Member

omichel commented Sep 29, 2023

I believe nothing changed in the way the Linux case is handled, so we can probably merge it as is.

@matl-hsk matl-hsk merged commit e07c737 into cyberbotics:master Sep 29, 2023
@matl-hsk matl-hsk deleted the fix-matlab-path-generation-on-mac branch September 29, 2023 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants