Skip to content

switch to ament, replace todos with ardent#3

Merged
dirk-thomas merged 1 commit intoardentfrom
use_ament
Jan 25, 2018
Merged

switch to ament, replace todos with ardent#3
dirk-thomas merged 1 commit intoardentfrom
use_ament

Conversation

@dirk-thomas
Copy link
Copy Markdown
Member

After it has been reviewed and merged and the name of the next ROS 2 release (B turtle) has been picked a branch for it can be created.

@dirk-thomas dirk-thomas self-assigned this Jan 25, 2018
Copy link
Copy Markdown
Member

@mikaelarguedas mikaelarguedas left a comment

Choose a reason for hiding this comment

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

one question about warning users when mixing versions/distros otherwise LGTM

CMakeLists.txt Outdated
set(shell "sh")
else()
set(shells "bat")
set(shell "bat")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I know the catkin and ament API are different but it would be great to have the same variable names in both branches to keep diff at a minimum

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I can rename the variable in the ROS 1 branch but the diff is irrelevant since each distro needs its own branch anyway.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I can rename the variable in the ROS 1 branch but the diff is irrelevant since each distro needs its own branch anyway.

Agreed we will never merge these branches together. It just seem easier to compare what's different in ROS1 and ROS 2 if we use the same variable names but that's not a blocker for this PR to be merged

ROS_DISTRO = environ.get("ROS_DISTRO_OVERRIDE", "TODO")
}@
if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "@(ROS_DISTRO)" ]; then
echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions."
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

do we want to keep that behavior for people unvoluntarily mixing workspaces?

Copy link
Copy Markdown
Member Author

@dirk-thomas dirk-thomas Jan 25, 2018

Choose a reason for hiding this comment

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

The ament API doesn't have the feature for .em templates. I could move the ROS distro name in to the CMake file and convert the env hooks into .in templates: 55af69a

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That works 👍

<buildtool_depend>ament_cmake_core</buildtool_depend>

<export>
<build_type>ament_cmake</build_type>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is use of the ament_cmake build type possible when depending only on ament_cmake_core?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, the build type is only relevant to the build tool - it is not related to the build system / CMake part.

@dirk-thomas dirk-thomas merged commit 3de6e33 into ardent Jan 25, 2018
@dirk-thomas dirk-thomas deleted the use_ament branch January 25, 2018 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants