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

Backport #561: Use common::setenv #666

Merged
merged 1 commit into from
Mar 8, 2021
Merged

Conversation

chapulina
Copy link
Contributor

🦟 Bug fix

Summary

Backporting #561.

Similar to #665, the motivation is to make forward-porting changes easier. On #622 we had to make lots of changes for the code ported from Dome to Edifice to work on Windows. If we encourage proper usage of common::setenv from Citadel, new plugins should use correct boilerplate from the beginning.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

@chapulina chapulina requested a review from j-rivero March 3, 2021 18:13
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Mar 3, 2021
@chapulina chapulina added the Windows Windows support label Mar 3, 2021
@chapulina chapulina changed the base branch from ign-gazebo4 to ign-gazebo3 March 3, 2021 18:16
@chapulina chapulina added 🏰 citadel Ignition Citadel and removed 🔮 dome Ignition Dome labels Mar 3, 2021
@codecov
Copy link

codecov bot commented Mar 3, 2021

Codecov Report

Merging #666 (d3758c2) into ign-gazebo3 (e592cae) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           ign-gazebo3     #666   +/-   ##
============================================
  Coverage        77.88%   77.88%           
============================================
  Files              210      210           
  Lines            11648    11649    +1     
============================================
+ Hits              9072     9073    +1     
  Misses            2576     2576           
Impacted Files Coverage Δ
src/Util.cc 95.18% <100.00%> (+0.02%) ⬆️
src/Server.cc 82.80% <0.00%> (-0.64%) ⬇️
src/gui/plugins/entity_tree/EntityTree.cc 13.73% <0.00%> (+0.54%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e592cae...d3758c2. Read the comment docs.

_putenv(sstr.str().c_str());
}
#ifdef _MSC_VER
# define popen _popen
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is a backport, but are these lines related with these changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, the removal of the custom setenv functions goes well with the rest of the changes, but the popen defines are not directly related.

Since this was in the original PR, I'm leaning towards leaving it here to decrease the diff between branches. It shouldn't really affect ign-gazebo3 because it's not supported on Windows.

@chapulina chapulina merged commit 7d98df4 into ign-gazebo3 Mar 8, 2021
@chapulina chapulina deleted the chapulina/3/561 branch March 8, 2021 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel Windows Windows support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants