Skip to content

Commit ea39ca6

Browse files
Merge pull request #23 from wep21/update-backward-ros
chore: update backward ros and patch
2 parents 6e7079b + 80b0184 commit ea39ca6

File tree

8 files changed

+11
-26
lines changed

8 files changed

+11
-26
lines changed

patch/ros-jazzy-backward-ros.patch

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 64af86c..9be355d 100644
2+
index 317f65f..1f38e81 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -27,6 +27,7 @@ include(cmake/BackwardConfig.cmake)
@@ -33,10 +33,10 @@ index 77d22d2..8e95287 100644
3333
list(APPEND _BACKWARD_INCLUDE_DIRS ${BACKWARD_INCLUDE_DIR})
3434

3535
diff --git a/cmake/BackwardConfigAment.cmake b/cmake/BackwardConfigAment.cmake
36-
index 273a51a..d981cbb 100644
36+
index 273a51a..3a1a726 100644
3737
--- a/cmake/BackwardConfigAment.cmake
3838
+++ b/cmake/BackwardConfigAment.cmake
39-
@@ -24,5 +24,13 @@ foreach(lib ${backward_ros_forced_LIBRARIES})
39+
@@ -24,5 +24,12 @@ foreach(lib ${backward_ros_forced_LIBRARIES})
4040
set(backward_ros_full_path_LIBRARIES "${backward_ros_full_path_LIBRARIES} ${lib}")
4141
endif()
4242
endforeach()
@@ -50,26 +50,8 @@ index 273a51a..d981cbb 100644
5050
+endif()
5151
+
5252
+SET(CMAKE_EXE_LINKER_FLAGS "${no_as_needed} ${backward_ros_full_path_LIBRARIES} ${as_needed} ${CMAKE_EXE_LINKER_FLAGS}")
53-
+
54-
diff --git a/backward_rosConfig.cmake.in b/backward_rosConfig.cmake.in
55-
index 6713e91..282e194 100644
56-
--- a/backward_rosConfig.cmake.in
57-
+++ b/backward_rosConfig.cmake.in
58-
@@ -2,8 +2,10 @@
59-
set_and_check(backward_ros_INCLUDE_DIRS "@BACKWARD_ROS_INSTALL_PREFIX@/include")
60-
if(WIN32)
61-
set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/backward.lib")
62-
+elseif(APPLE)
63-
+set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/libbackward.dylib")
64-
else()
65-
set_and_check(backward_ros_LIBRARIES "@BACKWARD_ROS_INSTALL_PREFIX@/lib/libbackward.so")
66-
endif()
67-
check_required_components(backward_ros)
68-
-include(@BACKWARD_ROS_INSTALL_PREFIX@/share/@PROJECT_NAME@/cmake/BackwardConfigAment.cmake)
69-
\ No newline at end of file
70-
+include(@BACKWARD_ROS_INSTALL_PREFIX@/share/@PROJECT_NAME@/cmake/BackwardConfigAment.cmake)
7153
diff --git a/package.xml b/package.xml
72-
index e8bc10a..d39e613 100644
54+
index 6de8f0e..3ac0db1 100644
7355
--- a/package.xml
7456
+++ b/package.xml
7557
@@ -11,6 +11,7 @@

pkg_additional_info.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
angles:
22
build_number: 3
3+
backward_ros:
4+
build_number: 3
35
ros_workspace:
46
build_number: 3
57
rviz_common:

rosdistro_snapshot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ azure_iot_sdk_c:
480480
url: https://github.com/ros2-gbp/azure_iot_sdk_c-release.git
481481
version: 1.14.0
482482
backward_ros:
483-
tag: release/jazzy/backward_ros/1.0.6-1
483+
tag: release/jazzy/backward_ros/1.0.7-1
484484
url: https://github.com/ros2-gbp/backward_ros-release.git
485-
version: 1.0.6
485+
version: 1.0.7
486486
bag2_to_image:
487487
tag: release/jazzy/bag2_to_image/0.1.0-5
488488
url: https://github.com/ros2-gbp/bag2_to_image-release.git

vinca_linux_64.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,5 @@ packages_select_by_deps:
8282

8383
- flex_sync
8484

85-
8685
patch_dir: patch
8786
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_linux_aarch64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,6 @@ packages_select_by_deps:
8282

8383
- flex_sync
8484

85+
8586
patch_dir: patch
8687
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_osx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,6 @@ packages_select_by_deps:
9292
- gripper_controllers
9393

9494

95+
9596
patch_dir: patch
9697
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_osx_arm64.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,5 @@ packages_select_by_deps:
9191
- flex_sync
9292
- gripper_controllers
9393

94-
9594
patch_dir: patch
9695
rosdistro_snapshot: rosdistro_snapshot.yaml

vinca_win.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ packages_select_by_deps:
9494

9595
- flex_sync
9696

97+
9798
patch_dir: patch
9899
rosdistro_snapshot: rosdistro_snapshot.yaml
99100

0 commit comments

Comments
 (0)