From d90711b229fbd8ca15ee5523a6cee68ab0eadb16 Mon Sep 17 00:00:00 2001 From: Georg Bartels Date: Wed, 3 Dec 2014 09:06:16 +0100 Subject: [PATCH] Removed cffi_ros_utils because it moved to repository cram_3rdparty. --- cffi_ros_utils/CMakeLists.txt | 5 -- cffi_ros_utils/asdf/cffi-ros-utils.asd | 1 - cffi_ros_utils/cffi-ros-utils.asd | 40 ------------- cffi_ros_utils/mainpage.dox | 26 -------- cffi_ros_utils/package.xml | 27 --------- cffi_ros_utils/src/package.lisp | 39 ------------ cffi_ros_utils/src/ros-libraries.lisp | 82 -------------------------- cram_highlevel/package.xml | 3 +- 8 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 cffi_ros_utils/CMakeLists.txt delete mode 120000 cffi_ros_utils/asdf/cffi-ros-utils.asd delete mode 100644 cffi_ros_utils/cffi-ros-utils.asd delete mode 100644 cffi_ros_utils/mainpage.dox delete mode 100644 cffi_ros_utils/package.xml delete mode 100644 cffi_ros_utils/src/package.lisp delete mode 100644 cffi_ros_utils/src/ros-libraries.lisp diff --git a/cffi_ros_utils/CMakeLists.txt b/cffi_ros_utils/CMakeLists.txt deleted file mode 100644 index f8c902e..0000000 --- a/cffi_ros_utils/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(cffi_ros_utils) -find_package(catkin REQUIRED) - -catkin_package() diff --git a/cffi_ros_utils/asdf/cffi-ros-utils.asd b/cffi_ros_utils/asdf/cffi-ros-utils.asd deleted file mode 120000 index fd78b76..0000000 --- a/cffi_ros_utils/asdf/cffi-ros-utils.asd +++ /dev/null @@ -1 +0,0 @@ -../cffi-ros-utils.asd \ No newline at end of file diff --git a/cffi_ros_utils/cffi-ros-utils.asd b/cffi_ros_utils/cffi-ros-utils.asd deleted file mode 100644 index 428c415..0000000 --- a/cffi_ros_utils/cffi-ros-utils.asd +++ /dev/null @@ -1,40 +0,0 @@ -;;; -;;; Copyright (c) 2010, Lorenz Moesenlechner -;;; All rights reserved. -;;; -;;; Redistribution and use in source and binary forms, with or without -;;; modification, are permitted provided that the following conditions are met: -;;; -;;; * Redistributions of source code must retain the above copyright -;;; notice, this list of conditions and the following disclaimer. -;;; * Redistributions in binary form must reproduce the above copyright -;;; notice, this list of conditions and the following disclaimer in the -;;; documentation and/or other materials provided with the distribution. -;;; * Neither the name of the Intelligent Autonomous Systems Group/ -;;; Technische Universitaet Muenchen nor the names of its contributors -;;; may be used to endorse or promote products derived from this software -;;; without specific prior written permission. -;;; -;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -;;; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -;;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -;;; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -;;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -;;; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -;;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -;;; POSSIBILITY OF SUCH DAMAGE. -;;; - -(defsystem cffi-ros-utils - :author "Lorenz Moesenlechner " - :license "BSD" - - :depends-on (cffi cffi-grovel ros-load-manifest split-sequence) - :components - ((:module "src" - :components - ((:file "package") - (:file "ros-libraries" :depends-on ("package")))))) diff --git a/cffi_ros_utils/mainpage.dox b/cffi_ros_utils/mainpage.dox deleted file mode 100644 index 63865bf..0000000 --- a/cffi_ros_utils/mainpage.dox +++ /dev/null @@ -1,26 +0,0 @@ -/** -\mainpage -\htmlinclude manifest.html - -\b cffi_ros_utils is ... - - - - -\section codeapi Code API - - - - -*/ diff --git a/cffi_ros_utils/package.xml b/cffi_ros_utils/package.xml deleted file mode 100644 index c7d398e..0000000 --- a/cffi_ros_utils/package.xml +++ /dev/null @@ -1,27 +0,0 @@ - - cffi_ros_utils - 0.1.0 - - ROS related CFFI interface - - - Lorenz Moesenlechner - - Lorenz Moesenlechner - - BSD - - http://ros.org/wiki/cffi_ros_utils - https://github.com/cram-code/cram_highlevel/issues - https://github.com/cram-code/cram_highlevel - - catkin - - cffi - split_sequence - sbcl - - cffi - split_sequence - sbcl - diff --git a/cffi_ros_utils/src/package.lisp b/cffi_ros_utils/src/package.lisp deleted file mode 100644 index 23b78ce..0000000 --- a/cffi_ros_utils/src/package.lisp +++ /dev/null @@ -1,39 +0,0 @@ -;;; -;;; Copyright (c) 2010, Lorenz Moesenlechner -;;; All rights reserved. -;;; -;;; Redistribution and use in source and binary forms, with or without -;;; modification, are permitted provided that the following conditions are met: -;;; -;;; * Redistributions of source code must retain the above copyright -;;; notice, this list of conditions and the following disclaimer. -;;; * Redistributions in binary form must reproduce the above copyright -;;; notice, this list of conditions and the following disclaimer in the -;;; documentation and/or other materials provided with the distribution. -;;; * Neither the name of the Intelligent Autonomous Systems Group/ -;;; Technische Universitaet Muenchen nor the names of its contributors -;;; may be used to endorse or promote products derived from this software -;;; without specific prior written permission. -;;; -;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -;;; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -;;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -;;; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -;;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -;;; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -;;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -;;; POSSIBILITY OF SUCH DAMAGE. -;;; - -(in-package :cl-user) - -(defpackage cffi-ros-utils - (:use #:common-lisp #:cffi) - (:export - :ros-library-paths - :ros-include-paths - :ros-grovel-file - :define-foreign-ros-library)) diff --git a/cffi_ros_utils/src/ros-libraries.lisp b/cffi_ros_utils/src/ros-libraries.lisp deleted file mode 100644 index 42b9abd..0000000 --- a/cffi_ros_utils/src/ros-libraries.lisp +++ /dev/null @@ -1,82 +0,0 @@ -;;; -;;; Copyright (c) 2010, Lorenz Moesenlechner -;;; All rights reserved. -;;; -;;; Redistribution and use in source and binary forms, with or without -;;; modification, are permitted provided that the following conditions are met: -;;; -;;; * Redistributions of source code must retain the above copyright -;;; notice, this list of conditions and the following disclaimer. -;;; * Redistributions in binary form must reproduce the above copyright -;;; notice, this list of conditions and the following disclaimer in the -;;; documentation and/or other materials provided with the distribution. -;;; * Neither the name of the Intelligent Autonomous Systems Group/ -;;; Technische Universitaet Muenchen nor the names of its contributors -;;; may be used to endorse or promote products derived from this software -;;; without specific prior written permission. -;;; -;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -;;; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -;;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -;;; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -;;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -;;; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -;;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -;;; POSSIBILITY OF SUCH DAMAGE. -;;; - -(in-package :cffi-ros-utils) - -(defun ros-library-paths (pkg-name) - "Returns the list of library paths as exported by the ROS package - with name `pkg-name' in its cpp tag. This function parses the lflags - attribute and collects all library paths specified by -L." - (apply #'append (mapcar (lambda (seq) - (split-sequence:split-sequence #\: (subseq seq 2) :remove-empty-subseqs t)) - (delete-if-not - (lambda (seq) - (equal (subseq seq 0 2) "-L")) - (split-sequence:split-sequence - #\Space - (car (ros-load:rospack "export" "--lang=cpp" "--attrib=lflags" pkg-name)) - :remove-empty-subseqs t))))) - -(defun ros-include-paths (pkg-name) - "Returns the list of include paths as exported by the ROS package - `pkg-name'" - (split-sequence:split-sequence - #\Space - (car (ros-load:rospack "cflags-only-I" pkg-name)) - :remove-empty-subseqs t)) - -(defclass ros-grovel-file (cffi-grovel:grovel-file) - ((ros-package :initarg :ros-package))) - -(defmethod reinitialize-instance :after ((c ros-grovel-file) - &key (ros-package ros-load:*current-ros-package*)) - (setf (cffi-grovel::cc-flags-of c) - (append (mapcar (lambda (path) - (concatenate 'string "-I" path)) - (ros-include-paths ros-package)) - (cffi-grovel::cc-flags-of c)))) - -(defmacro define-foreign-ros-library (alias lib-file &optional (ros-package ros-load:*current-ros-package*)) - (flet ((find-ros-library (file ros-package) - (let ((file-path (pathname file))) - (dolist (lib-path (ros-library-paths ros-package) nil) - (let ((complete-file-path (merge-pathnames - file-path - (make-pathname :directory lib-path)))) - (format t "~a~%" complete-file-path) - (when (probe-file complete-file-path) - (return-from find-ros-library complete-file-path))))))) - `(define-foreign-library ,alias - (:unix ,(namestring - (or (find-ros-library lib-file ros-package) - (error - 'simple-error - :format-control "Unable to find ros library `~a' in dependencies of package ~a" - :format-arguments (list lib-file ros-package)))))))) diff --git a/cram_highlevel/package.xml b/cram_highlevel/package.xml index 255985c..631cf43 100644 --- a/cram_highlevel/package.xml +++ b/cram_highlevel/package.xml @@ -31,7 +31,6 @@ semantic_map_collision_environment/ semantic_map_costmap/ cl_semantic_map_utils/ - cffi_ros_utils/ cram_manipulation_knowledge/ cram_physics_utils/ cram_plan_actionserver/ @@ -51,4 +50,4 @@ - \ No newline at end of file +