Conversation
|
Instead of requiring |
|
@dirk-thomas Someone could also unset |
|
Someone could also unset |
|
That's OpenSplice specific, the As to where we ensure the |
|
I moved it to I still need to test this locally. |
caa0558 to
366a792
Compare
|
I also added a check to see if the |
|
I've tested it locally: I still need to test it manually on Windows, but the build is passing on Windows: http://ci.ros2.org/job/ros2_batch_ci_windows/377/ It has test failures, but I'll have to dig into them to know if that's expected or not. |
There was a problem hiding this comment.
Please don't use CMAKE_INSTALL_PREFIX since it breaks the ability to relocate the install space. Use $AMENT_CURRENT_PREFIX instead.
Same below.
|
This works on Linux, but is still not working correctly on Windows, I'll look into it today and make a decision about its feasibility as a fix on Windows. |
|
I've given up on getting it to work around on Windows, as I do on the other platforms. So now the Windows env hook sets the I'll do uncrustify and squash after lunch, CI for now: |
|
CI looks good. The test failures on Windows seem to be unrelated. I just finished manually running the examples on Windows as well, setting, changing, and unsetting the I think this is ready for review. I'll squash after review. |
|
LGTM |
…is set this config file uses the ROS_DOMIAN_ID env var, but other wise it is identical to the default config file from OpenSplice
5a997dc to
bdd82d2
Compare
Support changing the ROS_DOMAIN_ID in OpenSplice without changing the config file
|
I "fixed" the indentation level of the xml file from 3 to 4 spaces since that is the format osplconf uses when writing files: 44278bd |
Currently you have to update the system installed OpenSplice config file, or override it using
OSPL_URIin order to use a differentROS_DOMAIN_ID. This is out of sync with the other implementations and inconvenient.So this pull request works around this issue by copying the default configuration for OpenSplice into the
opensplice_cmake_modulepackage, replacing the default domain id (0) with${ROS_DOMAIN_ID}, installing it to the workspace, and changing the environment hooks to default to referencing this file rather than the built-in one. This means that when this config file is evaluated by OpenSplice it will substitute the${ROS_DOMAIN_ID}in the config file with what ever is in the environment. This strategy is based on the feedback I got on their forum:http://forums.opensplice.org/index.php?/topic/2591-programmatically-choosing-the-domain-id/#entry4471
The other thing we have to do is to ensure that the
ROS_DOMAIN_IDis set before trying to use OpenSplice, and therefore forcing the configuration file to be evaluated. See ros2/rclcpp#102Still testing, not quite ready for review.