From 930b43df3ceb6f5c08967daa1284a10825ae447f Mon Sep 17 00:00:00 2001 From: Griffin Tabor Date: Tue, 26 Sep 2023 15:14:20 -0600 Subject: [PATCH 1/4] Add plotjuggler to windows --- vinca_win.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vinca_win.yaml b/vinca_win.yaml index 3106d637e..63e3bfe24 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -147,8 +147,8 @@ packages_select_by_deps: # Need to build in own stage # - fcl # - teb_local_planner - # - plotjuggler_ros - + - plotjuggler_ros + - plotjuggler # - openslam-gmapping # - laser-proc From 845b914d42565a72ce3f42b225fee99480ba4ae6 Mon Sep 17 00:00:00 2001 From: Griffin Tabor Date: Tue, 26 Sep 2023 16:30:21 -0600 Subject: [PATCH 2/4] add it to linux too, why not mostly I just want to see if windows segfaults again --- vinca_linux_64.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index 44e8de850..ab745c22b 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -122,8 +122,8 @@ packages_select_by_deps: # - tf2_sensor_msgs # - tf2_tools # - gps-common - # - plotjuggler - # - plotjuggler_ros + - plotjuggler + - plotjuggler_ros # - rosbridge_suite # - swri-console # - panda_moveit_config From ec3d7d60239240a4ea0665e49ceec502006f9f55 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Mon, 13 Nov 2023 07:28:25 +1000 Subject: [PATCH 3/4] Add protobuf as host dep --- patch/dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 2c4e3ff0b..3f10fd74b 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -120,4 +120,4 @@ resource_retriever: add_host: ["libcurl"] add_run: ["libcurl"] plotjuggler: - add_host: [{"sel(linux)": "elfutils"}] + add_host: [{"sel(linux)": "elfutils"}, "protobuf"] From 8028b646ae0f086b6cf785daad31916b96e16ce2 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 16 Feb 2024 15:47:11 +1000 Subject: [PATCH 4/4] Tidy up yaml --- vinca_win.yaml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/vinca_win.yaml b/vinca_win.yaml index 6ed937917..839e1aa5a 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -29,7 +29,6 @@ packages_remove_from_deps: - stage skip_existing: - # - https://conda.anaconda.org/robostack/ - https://conda.anaconda.org/robostack-staging/ # This list contains lots of commented-out package names. That is okay. @@ -118,11 +117,15 @@ packages_select_by_deps: - teb-local-planner - turtlebot3 - turtlebot3-fake + - plotjuggler_ros + - plotjuggler + - rosserial-arduino + ## + ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED + ## # Fails due to Too long input line. # - hector-gazebo-plugins - - ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED # - dynamixel-sdk -- this one not ready for Windows # - tf2_web_republisher # - libfranka @@ -152,8 +155,6 @@ packages_select_by_deps: # Need to build in own stage # - fcl # - teb_local_planner - - plotjuggler_ros - - plotjuggler # - openslam-gmapping # - laser-proc @@ -462,12 +463,6 @@ packages_select_by_deps: # - wireless-msgs # - xpp-msgs # - xv-11-laser-driver - - # ## - # # DONE Win - # ## - - - rosserial-arduino # - rosbash # - tf2_web_republisher # - grid_map