suppor debbuild for ROS_DISTRO

tork-a · Nov 23, 2020 · 43688ff · 43688ff
1 parent e35a589
commit 43688ff
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/ethercat_manager/CMakeLists.txt b/ethercat_manager/CMakeLists.txt
@@ -68,8 +68,13 @@ endif()
 # debbuild
 # catkin build minas_control --make-args debbuild
 # ROS_PARALLEL_JOBS='' catkin_make --pkg minas_control -- debbuild
+find_program(LSB_RELEASE_EXEC lsb_release)
+execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 add_custom_target(debbuild_${PROJECT_NAME}
-  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version trusty --ros-distro indigo
+  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version ${LSB_RELEASE_ID_SHORT} --ros-distro $ENV{ROS_DISTRO}
   COMMAND MAKEFLAGS= fakeroot debian/rules binary
   COMMAND rm -fr debian obj-x86_64-linux-gnu
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

diff --git a/minas_control/CMakeLists.txt b/minas_control/CMakeLists.txt
@@ -95,9 +95,14 @@ endif()
 # debbuild
 # catkin build minas_control --make-args debbuild
 # ROS_PARALLEL_JOBS='' catkin_make --pkg minas_control -- debbuild
+find_program(LSB_RELEASE_EXEC lsb_release)
+execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 add_custom_target(debbuild_${PROJECT_NAME}
   COMMAND sudo -n true || (>&2 echo "debbuild need sudo access to make debs" && exit 1)
-  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version trusty --ros-distro indigo
+  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version ${LSB_RELEASE_ID_SHORT} --ros-distro $ENV{ROS_DISTRO}
   COMMAND MAKEFLAGS= fakeroot debian/rules binary
   COMMAND find debian obj-x86_64-linux-gnu -type f -not -name postinst -print0 | xargs -0 rm --
   COMMAND find debian obj-x86_64-linux-gnu -type d -empty -delete

diff --git a/tra1_bringup/CMakeLists.txt b/tra1_bringup/CMakeLists.txt
@@ -48,9 +48,14 @@ endif()
 # debbuild
 # catkin build minas_control --make-args debbuild
 # ROS_PARALLEL_JOBS='' catkin_make --pkg minas_control -- debbuild
+find_program(LSB_RELEASE_EXEC lsb_release)
+execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 add_custom_target(debbuild_${PROJECT_NAME}
   COMMAND sudo -n true || (>&2 echo "debbuild need sudo access to make debs" && exit 1)
-  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version trusty --ros-distro indigo
+  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version ${LSB_RELEASE_ID_SHORT}  --ros-distro $ENV{ROS_DISTRO}
   COMMAND MAKEFLAGS= fakeroot debian/rules binary
   COMMAND rm -fr debian obj-x86_64-linux-gnu
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

diff --git a/tra1_description/CMakeLists.txt b/tra1_description/CMakeLists.txt
@@ -38,9 +38,14 @@ endif()
 # debbuild
 # catkin build minas_control --make-args debbuild
 # ROS_PARALLEL_JOBS='' catkin_make --pkg minas_control -- debbuild
+find_program(LSB_RELEASE_EXEC lsb_release)
+execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 add_custom_target(debbuild_${PROJECT_NAME}
   COMMAND sudo -n true || (>&2 echo "debbuild need sudo access to make debs" && exit 1)
-  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version trusty --ros-distro indigo
+  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version ${LSB_RELEASE_ID_SHORT} --ros-distro $ENV{ROS_DISTRO}
   COMMAND MAKEFLAGS= fakeroot debian/rules binary
   COMMAND rm -fr debian obj-x86_64-linux-gnu
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

diff --git a/tra1_moveit_config/CMakeLists.txt b/tra1_moveit_config/CMakeLists.txt
@@ -31,9 +31,14 @@ endif()
 # debbuild
 # catkin build minas_control --make-args debbuild
 # ROS_PARALLEL_JOBS='' catkin_make --pkg minas_control -- debbuild
+find_program(LSB_RELEASE_EXEC lsb_release)
+execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 add_custom_target(debbuild_${PROJECT_NAME}
   COMMAND sudo -n true || (>&2 echo "debbuild need sudo access to make debs" && exit 1)
-  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version trusty --ros-distro indigo
+  COMMAND bloom-generate rosdebian --os-name ubuntu --os-version ${LSB_RELEASE_ID_SHORT}  --ros-distro $ENV{ROS_DISTRO}
   COMMAND MAKEFLAGS= fakeroot debian/rules binary
   COMMAND rm -fr debian obj-x86_64-linux-gnu
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}