From 810d5ee11a5daa87ccda29dadfab4b31758662de Mon Sep 17 00:00:00 2001 From: Joe Romano Date: Fri, 20 Nov 2015 18:07:58 -0500 Subject: [PATCH 1/4] typo in variable name in schedule_cmd_for_removal schedule_comand_for_removal function referenced `command` variable while `cmd` was passed in. believed to be a typo. --- bot2-procman/python/src/bot_procman/sheriff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot2-procman/python/src/bot_procman/sheriff.py b/bot2-procman/python/src/bot_procman/sheriff.py index 57d398f..d081a89 100644 --- a/bot2-procman/python/src/bot_procman/sheriff.py +++ b/bot2-procman/python/src/bot_procman/sheriff.py @@ -1040,8 +1040,8 @@ def schedule_command_for_removal(self, cmd): """ if self._is_observer: raise ValueError("Can't remove commands in Observer mode") - deputy = self.get_command_deputy(command) - status_changes = deputy._schedule_for_removal(command) + deputy = self.get_command_deputy(cmd) + status_changes = deputy._schedule_for_removal(cmd) self._maybe_emit_status_change_signals(deputy, status_changes) self.send_orders() From 066bbdbeadd91507b387270b9d6b18eaf585b8dd Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Thu, 17 Mar 2016 14:11:11 -0400 Subject: [PATCH 2/4] Add "dummy" install target Add some no-op install logic to force creation of an 'install' target. This allows for easier use of libbot via CMake external projects, by not requiring such users to explicitly disable the install step. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e830b..0527e8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,3 +115,5 @@ else() CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}) endif() + +install(CODE "message(\"Nothing to do for install.\")") From cdb3e4e6e996b4b0d9aeb8437f25512979118f09 Mon Sep 17 00:00:00 2001 From: Peter KT Yu Date: Fri, 1 Apr 2016 01:12:14 -0400 Subject: [PATCH 3/4] fix typo --- bot2-procman/python/src/bot_procman/sheriff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot2-procman/python/src/bot_procman/sheriff.py b/bot2-procman/python/src/bot_procman/sheriff.py index d081a89..0c8eba7 100644 --- a/bot2-procman/python/src/bot_procman/sheriff.py +++ b/bot2-procman/python/src/bot_procman/sheriff.py @@ -322,8 +322,8 @@ def owns_command(self, cmd_object): @return True if this deputy object manages \p command, False if not. """ - return command.sheriff_id in self._commands and \ - self._commands [command.sheriff_id] is command + return cmd_object.sheriff_id in self._commands and \ + self._commands [cmd_object.sheriff_id] is cmd_object def _update_from_deputy_info2(self, dep_info_msg): """ From 647915b03c7430eb12dcd1fc8a0bf05c76f455fe Mon Sep 17 00:00:00 2001 From: "John R. Hoare" Date: Mon, 11 Jul 2016 19:23:54 +0000 Subject: [PATCH 4/4] Changed so builds happen out of source. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0527e8b..8ec48a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,25 +61,25 @@ set(default_cmake_args ExternalProject_Add(bot2-core SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-core - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-core/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-core CMAKE_CACHE_ARGS ${default_cmake_args}) checkbuild(bot2-core) ExternalProject_Add(bot2-procman SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-procman - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-procman/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-procman CMAKE_CACHE_ARGS ${default_cmake_args}) checkbuild(bot2-procman) ExternalProject_Add(bot2-lcm-utils SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcm-utils CMAKE_CACHE_ARGS ${default_cmake_args}) checkbuild(bot2-lcm-utils) ExternalProject_Add(bot2-param SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-param - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-param/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-param CMAKE_CACHE_ARGS ${default_cmake_args} DEPENDS bot2-core) @@ -89,19 +89,19 @@ if (WITH_BOT_VIS) ExternalProject_Add(bot2-vis SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-vis - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-vis/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-vis CMAKE_CACHE_ARGS ${default_cmake_args} DEPENDS bot2-core) ExternalProject_Add(bot2-lcmgl SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS} DEPENDS bot2-vis) ExternalProject_Add(bot2-frames SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-frames - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-frames/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-frames CMAKE_CACHE_ARGS ${default_cmake_args} DEPENDS bot2-core bot2-param bot2-vis bot2-lcmgl) @@ -111,7 +111,7 @@ else() ExternalProject_Add(bot2-lcmgl SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl - BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build + BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}) endif()