-
Notifications
You must be signed in to change notification settings - Fork 47
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
ign -> gz Header Migration : ign-msgs #249
Conversation
f886fa6
to
d7535c2
Compare
e64a884
to
1ca5aa6
Compare
1ca5aa6
to
6d52db0
Compare
Codecov Report
@@ Coverage Diff @@
## main #249 +/- ##
==========================================
- Coverage 15.90% 14.08% -1.83%
==========================================
Files 382 764 +382
Lines 71409 142630 +71221
==========================================
+ Hits 11361 20088 +8727
- Misses 60048 122542 +62494
Continue to review full report at Codecov.
|
All green! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the import
calls inside downstream messages are broken with this PR. I tried to compile gz-sim
's main
branch on top of this PR and it fails with:
/home/chapulina/dev_focal/ws_garden/build/ignition-gazebo7/src/msgs/peer_control.pb.cc:23:8: error: _PROTOBUF_INTERNAL_EXPORT_protobuf_ignit
ion_2fmsgs_2fheader_2eproto_ does not name a type; did you mean _PROTOBUF_INTERNAL_EXPORT_protobuf_gz_2fmsgs_2fheader_2eproto_?
23 | extern PROTOBUF_INTERNAL_EXPORT_protobuf_ignition_2fmsgs_2fheader_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Header; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| PROTOBUF_INTERNAL_EXPORT_protobuf_gz_2fmsgs_2fheader_2eproto
/home/chapulina/dev_focal/ws_garden/build/ignition-gazebo7/src/msgs/peer_control.pb.cc:50:51: error: _scc_info_Header_ is not a member of _p
rotobuf_ignition_2fmsgs_2fheader_2eproto_
50 | &protobuf_ignition_2fmsgs_2fheader_2eproto::scc_info_Header.base,}}; | ^~~~~~~~~~~~~~~
/home/chapulina/dev_focal/ws_garden/build/ignition-gazebo7/src/msgs/peer_control.pb.cc: In function _void protobuf_peer_5fcontrol_2eproto::A
ddDescriptorsImpl()_:
/home/chapulina/dev_focal/ws_garden/build/ignition-gazebo7/src/msgs/peer_control.pb.cc:105:48: error: _AddDescriptors_ is not a member of _p
rotobuf_ignition_2fmsgs_2fheader_2eproto_
105 | ::protobuf_ignition_2fmsgs_2fheader_2eproto::AddDescriptors();
| ^~~~~~~~~~~~~~
I believe that's coming from here.
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
6d52db0
to
06921ea
Compare
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
06921ea
to
69bdd6a
Compare
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
1bcf11d
to
f649067
Compare
Codecov Report
@@ Coverage Diff @@
## main #249 +/- ##
=======================================
Coverage ? 15.90%
=======================================
Files ? 382
Lines ? 71409
Branches ? 0
=======================================
Hits ? 11361
Misses ? 60048
Partials ? 0 Continue to review full report at Codecov.
|
Signed-off-by: methylDragon <[email protected]>
f649067
to
b06fbe8
Compare
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
b06fbe8
to
837183e
Compare
Going with the deferred hard-tock option (B) with Gazebo builds. Once we're ready, and namespaces have been migrated, we will then move forward with hard-tocking every message (and message header) to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, this shouldn't break any downstream libraries as it is.
We'll come back for the hard tock later. I'd like to at least make the C++ redirection headers work, because that's what most people are using.
The proto namespaces are only used by people creating custom messages or doing some other kind of advanced usage of the messages. Ideally we'd tick-tick the change, but it's proving difficult, so I think those advanced users will have to deal with a hard-tock. Fortunately, the migration only requires a quick search-and-replace on their end.
include/ignition/msgs/Factory.hh
Outdated
@@ -1,5 +1,5 @@ | |||
/* | |||
* Copyright (C) 2016 Open Source Robotics Foundation | |||
* Copyright (C) 2017 Open Source Robotics Foundation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed! 684b316
I'll merge once CI is green 🙌
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
837183e
to
5b97333
Compare
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]> Signed-off-by: William Lew <[email protected]>
Signed-off-by: methylDragon <[email protected]> Signed-off-by: William Lew <[email protected]>
Signed-off-by: methylDragon <[email protected]> Signed-off-by: William Lew <[email protected]>
Signed-off-by: methylDragon <[email protected]> Signed-off-by: William Lew <[email protected]>
See gazebo-tooling/release-tools#711
Notes:
proto
message definitions forgz
andignition
will be installed alongside each other, but ONLY THEgz
proto messages will result in code generation for sources and headers.ignition
headers are instantiated as redirection headers pointing to thegz
versiongz
headers use theignition
namespace, pending namespace migration