Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

yocto_recipe.py: Use sensible default for <build_type> when not ROS 1 #267

Merged
merged 1 commit into from
Feb 21, 2020

Conversation

shr-project
Copy link
Contributor

…rsion isn't 1

Signed-off-by: Martin Jansa martin.jansa@lge.com

Copy link
Member

@tfoote tfoote left a comment

Choose a reason for hiding this comment

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

This logic makes sense.

@herb-kuta-lge
Copy link
Contributor

herb-kuta-lge commented Feb 6, 2020

@tfoote < From https://www.ros.org/reps/rep-0149.html#build-type-multiple:

If no <build_type> is provided, catkin is assumed.

Perhaps the specification should be updated for the ROS 2 case?

Copy link
Contributor

@herb-kuta-lge herb-kuta-lge left a comment

Choose a reason for hiding this comment

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

(ignore)

Copy link
Contributor

@herb-kuta-lge herb-kuta-lge left a comment

Choose a reason for hiding this comment

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

Suggested commit message:

yocto_recipe.py: Use sensible default for <build_type> when not ROS 1

It only makes sense for the default value for <build_type> to be "catkin" for ROS 1 distros. For others, use "ament_cmake".

* It only makes sense for the default value for <build_type> to be
  "catkin" for ROS 1 distros. For others, use "ament_cmake".

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
@herb-kuta-lge herb-kuta-lge changed the title yocto_recipe.py: change default build_type to ament_cmake when ros_ve… yocto_recipe.py: Use sensible default for <build_type> when not ROS 1 Feb 14, 2020
@herb-kuta-lge
Copy link
Contributor

herb-kuta-lge commented Feb 20, 2020

@allenh1 < Can you retrigger Travis? It failed with the

The command "sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654" failed and exited with 2

error just like the other one.

@allenh1
Copy link
Contributor

allenh1 commented Feb 21, 2020

@herb-kuta-lge done -- should be good now

@allenh1 allenh1 merged commit b81af34 into ros-infrastructure:master Feb 21, 2020
@shr-project shr-project deleted the jansa/ament-cmake branch March 20, 2020 17:13
@herb-kuta-lge herb-kuta-lge added this to the Version 0.3.2 milestone Apr 22, 2020
shr-project added a commit to shr-project/superflore that referenced this pull request Dec 10, 2020
…ot ROS 1 (ros-infrastructure#267)

* _get_ros_version() expects just a string (as in distro.name) not whole RosDistro class
  This is a bit confusing, because in many places we use the same distro variable
  as this string, rename it to make it more clear in the next commit.

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
shr-project added a commit to shr-project/superflore that referenced this pull request Dec 10, 2020
ros-infrastructure#267)

* if get_build_type returns 'catkin' and we're generating some ROS 2 distribution
  change it to 'ament_cmake' and show an error message

* there are couple cases where <export><build_type> is missing completely
  and then catkin_pkg get_build_type will return the default value as
  'catkin' as specified in
  https://www.ros.org/reps/rep-0149.html#build-type-multiple
  "If no <build_type> is provided, catkin is assumed."
  but this assumption doesn't work for ROS 2 distributions and in meta-ros
  we had to override these cases (as of 2020-12-05):

  dashing:
    https://raw.github.com/ros2-gbp/async_web_server_cpp-release/release/dashing/async_web_server_cpp/1.0.0-1/package.xml
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/dashing/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/dashing/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/dashing/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/ros2-gbp/web_video_server-release/release/dashing/web_video_server/1.0.0-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/dashing/mrt_cmake_modules/1.0.8-1/package.xml

  eloquent:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/eloquent/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/eloquent/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/eloquent/gps_umd/1.0.2-1/package.xml

  foxy:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/foxy/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/foxy/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/foxy/mrt_cmake_modules/1.0.8-1/package.xml

  rolling:
    https://raw.github.com/ros2-gbp/fmilibrary_vendor-release/release/rolling/fmilibrary_vendor/0.2.0-2/package.xml
    https://raw.github.com/ros2-gbp/gps_umd-release/release/rolling/gps_umd/1.0.3-2/package.xml

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
shr-project added a commit to shr-project/superflore that referenced this pull request Dec 11, 2020
ros-infrastructure#267)

* if get_build_type() returns 'catkin' and we're generating some ROS 2 distribution
  change it to 'ament_cmake' and show an error message

* there are couple cases where <export><build_type> is missing completely
  and then catkin_pkg get_build_type() will return the default value as
  'catkin' as specified in
  https://www.ros.org/reps/rep-0149.html#build-type-multiple
  "If no <build_type> is provided, catkin is assumed."
  but this assumption doesn't work for ROS 2 distributions and in meta-ros
  we had to override these cases (as of 2020-12-05):

  dashing:
    https://raw.github.com/ros2-gbp/async_web_server_cpp-release/release/dashing/async_web_server_cpp/1.0.0-1/package.xml
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/dashing/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/dashing/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/dashing/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/ros2-gbp/web_video_server-release/release/dashing/web_video_server/1.0.0-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/dashing/mrt_cmake_modules/1.0.8-1/package.xml

  eloquent:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/eloquent/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/eloquent/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/eloquent/gps_umd/1.0.2-1/package.xml

  foxy:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/foxy/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/foxy/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/foxy/mrt_cmake_modules/1.0.8-1/package.xml

  rolling:
    https://raw.github.com/ros2-gbp/fmilibrary_vendor-release/release/rolling/fmilibrary_vendor/0.2.0-2/package.xml
    https://raw.github.com/ros2-gbp/gps_umd-release/release/rolling/gps_umd/1.0.3-2/package.xml

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
herb-kuta-lge pushed a commit that referenced this pull request Dec 12, 2020
…ot ROS 1 (#267)

* _get_ros_version() expects just a string (as in distro.name) not whole RosDistro class
  This is a bit confusing, because in many places we use the same distro variable
  as this string, rename it to make it more clear in the next commit.

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
herb-kuta-lge pushed a commit that referenced this pull request Dec 12, 2020
#267)

* if get_build_type() returns 'catkin' and we're generating some ROS 2 distribution
  change it to 'ament_cmake' and show an error message

* there are couple cases where <export><build_type> is missing completely
  and then catkin_pkg get_build_type() will return the default value as
  'catkin' as specified in
  https://www.ros.org/reps/rep-0149.html#build-type-multiple
  "If no <build_type> is provided, catkin is assumed."
  but this assumption doesn't work for ROS 2 distributions and in meta-ros
  we had to override these cases (as of 2020-12-05):

  dashing:
    https://raw.github.com/ros2-gbp/async_web_server_cpp-release/release/dashing/async_web_server_cpp/1.0.0-1/package.xml
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/dashing/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/dashing/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/dashing/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/ros2-gbp/web_video_server-release/release/dashing/web_video_server/1.0.0-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/dashing/mrt_cmake_modules/1.0.8-1/package.xml

  eloquent:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/eloquent/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/eloquent/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/eloquent/gps_umd/1.0.2-1/package.xml

  foxy:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/foxy/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/foxy/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/foxy/mrt_cmake_modules/1.0.8-1/package.xml

  rolling:
    https://raw.github.com/ros2-gbp/fmilibrary_vendor-release/release/rolling/fmilibrary_vendor/0.2.0-2/package.xml
    https://raw.github.com/ros2-gbp/gps_umd-release/release/rolling/gps_umd/1.0.3-2/package.xml

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023
…ros-infrastructure#267)

* It only makes sense for the default value for <build_type> to be
  "catkin" for ROS 1 distros. For others, use "ament_cmake".

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023
…ot ROS 1 (ros-infrastructure#267)

* _get_ros_version() expects just a string (as in distro.name) not whole RosDistro class
  This is a bit confusing, because in many places we use the same distro variable
  as this string, rename it to make it more clear in the next commit.

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023
ros-infrastructure#267)

* if get_build_type() returns 'catkin' and we're generating some ROS 2 distribution
  change it to 'ament_cmake' and show an error message

* there are couple cases where <export><build_type> is missing completely
  and then catkin_pkg get_build_type() will return the default value as
  'catkin' as specified in
  https://www.ros.org/reps/rep-0149.html#build-type-multiple
  "If no <build_type> is provided, catkin is assumed."
  but this assumption doesn't work for ROS 2 distributions and in meta-ros
  we had to override these cases (as of 2020-12-05):

  dashing:
    https://raw.github.com/ros2-gbp/async_web_server_cpp-release/release/dashing/async_web_server_cpp/1.0.0-1/package.xml
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/dashing/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/dashing/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/dashing/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/ros2-gbp/web_video_server-release/release/dashing/web_video_server/1.0.0-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/dashing/mrt_cmake_modules/1.0.8-1/package.xml

  eloquent:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/eloquent/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/ros-geographic-info/geographic_info-release/release/eloquent/geographic_info/1.0.1-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/eloquent/gps_umd/1.0.2-1/package.xml

  foxy:
    https://raw.github.com/boschresearch/fmilibrary_vendor-release/release/foxy/fmilibrary_vendor/0.2.0-1/package.xml
    https://raw.github.com/swri-robotics-gbp/gps_umd-release/release/foxy/gps_umd/1.0.4-1/package.xml
    https://raw.github.com/KIT-MRT/mrt_cmake_modules-release/release/foxy/mrt_cmake_modules/1.0.8-1/package.xml

  rolling:
    https://raw.github.com/ros2-gbp/fmilibrary_vendor-release/release/rolling/fmilibrary_vendor/0.2.0-2/package.xml
    https://raw.github.com/ros2-gbp/gps_umd-release/release/rolling/gps_umd/1.0.3-2/package.xml

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants