From 71fad4006760091b8e1ebb451dc4e821b073b0cb Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 24 Sep 2012 22:37:00 +0000 Subject: [PATCH] more cleanup --- CMakeLists.txt | 49 ------------------- LICENSE/LICENSE | 1 - LICENSE/roscheck/BSD-Stanford-Morgan.txt | 25 ---------- LICENSE/roscheck/BSD-Willow-2009.txt | 26 ---------- LICENSE/roscheck/BSD-Willow-Morgan.txt | 24 --------- LICENSE/roscheck/BSD-Willow.txt | 26 ---------- core/mk/CMakeLists.txt | 2 + core/mk/manifest.xml | 6 --- core/mk/package.xml | 4 +- core/rosbuild/manifest.xml | 12 ----- core/rosbuild/package.xml | 4 +- core/roslang/manifest.xml | 15 ------ core/roslang/package.xml | 10 ++-- core/roslib/CMakeLists.txt | 16 +++--- core/roslib/env-hooks/10.ros.sh.in | 2 +- core/roslib/manifest.xml | 19 ------- core/roslib/package.xml | 10 ++-- core/roslib/setup.py | 2 +- ros/CMakeLists.txt | 4 -- ros/package.xml | 2 - tools/rosbash/CMakeLists.txt | 4 +- .../{ => env-hooks}/15.rosbash.bash.in | 0 .../{ => env-hooks}/15.rosbash.tcsh.in | 0 .../rosbash/{ => env-hooks}/15.rosbash.zsh.in | 0 tools/rosbash/manifest.xml | 15 ------ tools/rosbash/package.xml | 11 +---- tools/rosboost_cfg/manifest.xml | 13 ----- tools/rosboost_cfg/package.xml | 2 - tools/rosboost_cfg/setup.py | 1 - tools/rosclean/manifest.xml | 14 ------ tools/rosclean/package.xml | 4 +- tools/roscreate/CMakeLists.txt | 4 ++ tools/roscreate/manifest.xml | 21 -------- tools/roscreate/setup.py | 2 +- tools/rosmake/manifest.xml | 19 ------- tools/rosmake/package.xml | 1 - tools/rosunit/CMakeLists.txt | 9 ++-- tools/rosunit/manifest.xml | 18 ------- tools/rosunit/package.xml | 1 - 39 files changed, 34 insertions(+), 364 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 LICENSE/LICENSE delete mode 100644 LICENSE/roscheck/BSD-Stanford-Morgan.txt delete mode 100644 LICENSE/roscheck/BSD-Willow-2009.txt delete mode 100644 LICENSE/roscheck/BSD-Willow-Morgan.txt delete mode 100644 LICENSE/roscheck/BSD-Willow.txt delete mode 100644 core/mk/manifest.xml delete mode 100644 core/rosbuild/manifest.xml delete mode 100644 core/roslang/manifest.xml delete mode 100644 core/roslib/manifest.xml delete mode 100644 ros/CMakeLists.txt rename tools/rosbash/{ => env-hooks}/15.rosbash.bash.in (100%) rename tools/rosbash/{ => env-hooks}/15.rosbash.tcsh.in (100%) rename tools/rosbash/{ => env-hooks}/15.rosbash.zsh.in (100%) delete mode 100644 tools/rosbash/manifest.xml delete mode 100644 tools/rosboost_cfg/manifest.xml delete mode 100644 tools/rosclean/manifest.xml delete mode 100644 tools/roscreate/manifest.xml delete mode 100644 tools/rosmake/manifest.xml delete mode 100644 tools/rosunit/manifest.xml diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 9a4e73c5..00000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(ros) -find_package(catkin REQUIRED) -catkin_stack() -catkin_project(ros) -find_package(Boost REQUIRED COMPONENTS thread) - -# Must call catkin_python_setup() early, to ensure that things like -# rosunit are available in build-space, and can be found by things like -# catkin_add_gtest(), which is called from within lower-level CMakeLists.txts. -catkin_python_setup() - -catkin_add_env_hooks(10.ros SHELLS bat sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) - -foreach(subdir - core/roslang - core/roslib - tools/rosboost_cfg - tools/rosbash - tools/rosclean - tools/roscreate - tools/rosmake - tools/rosunit - ) - add_subdirectory(${subdir}) -endforeach() - -# INSTALLATION -install(FILES config/rosconsole.config - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config) - -# setup our backwards-compatibility ROS_ROOT -install(DIRECTORY core/rosbuild/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/core/rosbuild - PATTERN ".svn" EXCLUDE - PATTERN "bin" EXCLUDE - ) -install(PROGRAMS - core/rosbuild/bin/check_same_directories.py - core/rosbuild/bin/download_checkmd5.py - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/core/rosbuild/bin) -install(DIRECTORY core/mk/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/core/mk - PATTERN ".svn" EXCLUDE - ) - -install(DIRECTORY tools/roscreate/templates/ - DESTINATION share/roscreate/templates - PATTERN ".svn" EXCLUDE) diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE deleted file mode 100644 index 427698e2..00000000 --- a/LICENSE/LICENSE +++ /dev/null @@ -1 +0,0 @@ -Check the manifest.xml in each package directory for license information. diff --git a/LICENSE/roscheck/BSD-Stanford-Morgan.txt b/LICENSE/roscheck/BSD-Stanford-Morgan.txt deleted file mode 100644 index fd9a516c..00000000 --- a/LICENSE/roscheck/BSD-Stanford-Morgan.txt +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (C) 2008, Morgan Quigley - -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 Stanford University 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. - diff --git a/LICENSE/roscheck/BSD-Willow-2009.txt b/LICENSE/roscheck/BSD-Willow-2009.txt deleted file mode 100644 index 4fa677e6..00000000 --- a/LICENSE/roscheck/BSD-Willow-2009.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2009, Willow Garage, Inc. -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 Willow Garage, Inc. 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. diff --git a/LICENSE/roscheck/BSD-Willow-Morgan.txt b/LICENSE/roscheck/BSD-Willow-Morgan.txt deleted file mode 100644 index f4bac853..00000000 --- a/LICENSE/roscheck/BSD-Willow-Morgan.txt +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (C) 2008, Morgan Quigley and Willow Garage, Inc. - -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 names of Stanford University or Willow Garage, Inc. 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. diff --git a/LICENSE/roscheck/BSD-Willow.txt b/LICENSE/roscheck/BSD-Willow.txt deleted file mode 100644 index 747340fe..00000000 --- a/LICENSE/roscheck/BSD-Willow.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2008, Willow Garage, Inc. -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 Willow Garage, Inc. 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. diff --git a/core/mk/CMakeLists.txt b/core/mk/CMakeLists.txt index 186d96c7..779b9290 100644 --- a/core/mk/CMakeLists.txt +++ b/core/mk/CMakeLists.txt @@ -5,4 +5,6 @@ catkin_package() install(DIRECTORY . DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros/core/mk + PATTERN "CMakeLists.txt" EXCLUDE + PATTERN "package.xml" EXCLUDE PATTERN ".svn" EXCLUDE) diff --git a/core/mk/manifest.xml b/core/mk/manifest.xml deleted file mode 100644 index 076ed4e0..00000000 --- a/core/mk/manifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - A collection of .mk include files for building ROS architectural elements. Most package authors should use cmake .mk, which calls CMake for the build of the package. The other files in this package are intended for use in exotic situations that mostly arise when importing 3rdparty code. - Morgan Quigley, Brian Gerkey - BSD - - diff --git a/core/mk/package.xml b/core/mk/package.xml index 8ab0f785..b953f2eb 100644 --- a/core/mk/package.xml +++ b/core/mk/package.xml @@ -2,7 +2,9 @@ mk 1.9.12 -A collection of .mk include files for building ROS architectural elements. Most package authors should use cmake .mk, which calls CMake for the build of the package. The other files in this package are intended for use in exotic situations that mostly arise when importing 3rdparty code. + A collection of .mk include files for building ROS architectural elements. + Most package authors should use cmake .mk, which calls CMake for the build of the package. + The other files in this package are intended for use in exotic situations that mostly arise when importing 3rdparty code. Dirk Thomas BSD diff --git a/core/rosbuild/manifest.xml b/core/rosbuild/manifest.xml deleted file mode 100644 index 955ae264..00000000 --- a/core/rosbuild/manifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - -rosbuild contains scripts for managing the CMake-based build system for ROS. - - - Brian Gerkey, Troy Straszheim, Morgan Quigley - BSD - - http://ros.org/wiki/rosbuild - - diff --git a/core/rosbuild/package.xml b/core/rosbuild/package.xml index 0a819472..d028a8b7 100644 --- a/core/rosbuild/package.xml +++ b/core/rosbuild/package.xml @@ -2,9 +2,7 @@ rosbuild 1.9.12 - - rosbuild contains scripts for managing the CMake-based build system for ROS. - + rosbuild contains scripts for managing the CMake-based build system for ROS. Dirk Thomas BSD diff --git a/core/roslang/manifest.xml b/core/roslang/manifest.xml deleted file mode 100644 index bbefa598..00000000 --- a/core/roslang/manifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - roslang is a common package that all - ROS client - libraries depend on. This is mainly used to find client - libraries (via 'rospack depends-on1 roslang'). - - - Brian Gerkey/gerkey@willowgarage.com - BSD - - http://ros.org/wiki/roslang - - diff --git a/core/roslang/package.xml b/core/roslang/package.xml index 2d9d3610..d7fc4102 100644 --- a/core/roslang/package.xml +++ b/core/roslang/package.xml @@ -1,13 +1,9 @@ roslang 1.9.12 - - - roslang is a common package that all - ROS client - libraries depend on. This is mainly used to find client - libraries (via 'rospack depends-on1 roslang'). - + + roslang is a common package that all ROS client libraries depend on. + This is mainly used to find client libraries (via 'rospack depends-on1 roslang'). Dirk Thomas BSD diff --git a/core/roslib/CMakeLists.txt b/core/roslib/CMakeLists.txt index 0e2d4fe1..d6eb5b5b 100644 --- a/core/roslib/CMakeLists.txt +++ b/core/roslib/CMakeLists.txt @@ -5,10 +5,6 @@ catkin_package( LIBRARIES roslib CFG_EXTRAS roslib-extras.cmake) -catkin_python_setup() - -catkin_add_env_hooks(10.ros SHELLS bat sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) - find_package(Boost REQUIRED COMPONENTS thread) include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}) @@ -27,25 +23,25 @@ if(NOT (APPLE OR WIN32 OR MINGW)) endif() -#explicitly install library and includes +catkin_add_env_hooks(10.ros SHELLS bat sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) + +catkin_python_setup() + install(TARGETS roslib ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ) - install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} FILES_MATCHING PATTERN "*.h") +install(FILES config/rosconsole.config + DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros/config) install(PROGRAMS scripts/gendeps DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) -#integration tests catkin_add_nosetests(test) -include_directories(${GTEST_INCLUDE_DIRS}) -link_directories(${GTEST_LIBRARY_DIRS}) - catkin_add_gtest(${PROJECT_NAME}-utest test/utest.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) if(TARGET ${PROJECT_NAME}-utest) target_link_libraries(${PROJECT_NAME}-utest roslib ${Boost_LIBRARIES} ${catkin_LIBRARIES}) diff --git a/core/roslib/env-hooks/10.ros.sh.in b/core/roslib/env-hooks/10.ros.sh.in index 8003ccbd..9e5badb1 100644 --- a/core/roslib/env-hooks/10.ros.sh.in +++ b/core/roslib/env-hooks/10.ros.sh.in @@ -33,7 +33,7 @@ EOF export ROS_PACKAGE_PATH=`python -c "$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH"` if @BUILDSPACE@; then - export ROS_ROOT=@CMAKE_CURRENT_SOURCE_DIR@ + export ROS_ROOT=@CMAKE_CURRENT_SOURCE_DIR@/../.. export ROS_ETC_DIR=@CATKIN_BUILD_PREFIX@/@CATKIN_PACKAGE_ETC_DESTINATION@ fi if @INSTALLSPACE@; then diff --git a/core/roslib/manifest.xml b/core/roslib/manifest.xml deleted file mode 100644 index 65c5a3c0..00000000 --- a/core/roslib/manifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Base dependencies and support libraries for ROS. roslib contains many of the common data structures and tools that are shared across ROS client library implementations. - - - Ken Conley/kwc@willowgarage.com, Morgan Quigley/mquigley@cs.stanford.edu, Josh Faust/jfaust@willowgarage.com - BSD - - http://ros.org/wiki/roslib - - - - - - - - diff --git a/core/roslib/package.xml b/core/roslib/package.xml index e152d7eb..025cb3ee 100644 --- a/core/roslib/package.xml +++ b/core/roslib/package.xml @@ -1,10 +1,9 @@ roslib 1.9.12 - - - Base dependencies and support libraries for ROS. roslib contains many of the common data structures and tools that are shared across ROS client library implementations. - + + Base dependencies and support libraries for ROS. + roslib contains many of the common data structures and tools that are shared across ROS client library implementations. Dirk Thomas BSD @@ -14,9 +13,8 @@ Morgan Quigley Josh Faust - catkin boost - python + catkin rospack diff --git a/core/roslib/setup.py b/core/roslib/setup.py index ba1ffeb1..e91d5830 100644 --- a/core/roslib/setup.py +++ b/core/roslib/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup from catkin_pkg.package import parse_package_for_distutils d = parse_package_for_distutils() -d['packages'] = ['roslib'] +d['packages'] = ['ros', 'roslib'] d['package_dir'] = {'': 'src'} d['install_requires'] = ['rospkg'] diff --git a/ros/CMakeLists.txt b/ros/CMakeLists.txt deleted file mode 100644 index 741d3d5c..00000000 --- a/ros/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(ros) -find_package(catkin REQUIRED) -catkin_package() diff --git a/ros/package.xml b/ros/package.xml index 142dc954..7d8ae530 100644 --- a/ros/package.xml +++ b/ros/package.xml @@ -18,8 +18,6 @@ Morgan Quigley Rob Wheeler - catkin - mk rosbuild roslang diff --git a/tools/rosbash/CMakeLists.txt b/tools/rosbash/CMakeLists.txt index 2bcb05e7..44e81bcf 100644 --- a/tools/rosbash/CMakeLists.txt +++ b/tools/rosbash/CMakeLists.txt @@ -8,10 +8,10 @@ install(FILES rosbash rostcsh roszsh install(PROGRAMS scripts/rosrun DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) -message(STATUS " Making toplevel forward script for bash script rosrun") +# making toplevel forward script for bash script rosrun set(BASH_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/rosrun) configure_file(${catkin_EXTRAS_DIR}/templates/script.bash.in ${CATKIN_BUILD_PREFIX}/bin/rosrun @ONLY) -catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh) +catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) diff --git a/tools/rosbash/15.rosbash.bash.in b/tools/rosbash/env-hooks/15.rosbash.bash.in similarity index 100% rename from tools/rosbash/15.rosbash.bash.in rename to tools/rosbash/env-hooks/15.rosbash.bash.in diff --git a/tools/rosbash/15.rosbash.tcsh.in b/tools/rosbash/env-hooks/15.rosbash.tcsh.in similarity index 100% rename from tools/rosbash/15.rosbash.tcsh.in rename to tools/rosbash/env-hooks/15.rosbash.tcsh.in diff --git a/tools/rosbash/15.rosbash.zsh.in b/tools/rosbash/env-hooks/15.rosbash.zsh.in similarity index 100% rename from tools/rosbash/15.rosbash.zsh.in rename to tools/rosbash/env-hooks/15.rosbash.zsh.in diff --git a/tools/rosbash/manifest.xml b/tools/rosbash/manifest.xml deleted file mode 100644 index 1877e93e..00000000 --- a/tools/rosbash/manifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - -Assorted shell commands for using ros with bash. - - - Jeremy Leibs, Thibault Kruse - BSD - http://pr.willowgarage.com/wiki/rosbash - - - - - - diff --git a/tools/rosbash/package.xml b/tools/rosbash/package.xml index 1389771c..3ea3f79c 100644 --- a/tools/rosbash/package.xml +++ b/tools/rosbash/package.xml @@ -2,9 +2,7 @@ rosbash 1.9.12 - - Assorted shell commands for using ros with bash. - + Assorted shell commands for using ros with bash. Dirk Thomas BSD @@ -14,11 +12,4 @@ Thibault Kruse catkin - - - - - - - diff --git a/tools/rosboost_cfg/manifest.xml b/tools/rosboost_cfg/manifest.xml deleted file mode 100644 index 374138f1..00000000 --- a/tools/rosboost_cfg/manifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system - - - Josh Faust - BSD - - http://ros.org/wiki/rosboost_cfg - - - diff --git a/tools/rosboost_cfg/package.xml b/tools/rosboost_cfg/package.xml index 0ad20081..307bc8f0 100644 --- a/tools/rosboost_cfg/package.xml +++ b/tools/rosboost_cfg/package.xml @@ -2,9 +2,7 @@ rosboost_cfg 1.9.12 - Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system - Dirk Thomas BSD diff --git a/tools/rosboost_cfg/setup.py b/tools/rosboost_cfg/setup.py index eb5b092c..0749f63a 100644 --- a/tools/rosboost_cfg/setup.py +++ b/tools/rosboost_cfg/setup.py @@ -7,6 +7,5 @@ d = parse_package_for_distutils() d['packages'] = ['rosboost_cfg'] d['package_dir'] = {'': 'src'} d['scripts'] = ['scripts/rosboost-cfg'] -d['install_requires'] = ['rospkg'] setup(**d) diff --git a/tools/rosclean/manifest.xml b/tools/rosclean/manifest.xml deleted file mode 100644 index e55dec89..00000000 --- a/tools/rosclean/manifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - rosclean: cleanup filesystem resources (e.g. log files). - - - Ken Conley - BSD - - http://ros.org/wiki/rosclean - - - - diff --git a/tools/rosclean/package.xml b/tools/rosclean/package.xml index c5ec2a41..d649f7e4 100644 --- a/tools/rosclean/package.xml +++ b/tools/rosclean/package.xml @@ -1,10 +1,8 @@ rosclean 1.9.12 - - + rosclean: cleanup filesystem resources (e.g. log files). - Dirk Thomas BSD diff --git a/tools/roscreate/CMakeLists.txt b/tools/roscreate/CMakeLists.txt index 72b31192..db58e050 100644 --- a/tools/roscreate/CMakeLists.txt +++ b/tools/roscreate/CMakeLists.txt @@ -5,4 +5,8 @@ catkin_package() catkin_python_setup() +install(DIRECTORY templates/ + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/templates + PATTERN ".svn" EXCLUDE) + catkin_add_nosetests(test) diff --git a/tools/roscreate/manifest.xml b/tools/roscreate/manifest.xml deleted file mode 100644 index 73fed1ac..00000000 --- a/tools/roscreate/manifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - roscreate contains tools that assist in the creation of ROS filesystem resources. There are currently - two tools that it provides: roscreate-pkg and roscreate-stack. roscreate-pkg creates a new package directory, - including the appropriate build and manifest files. roscreate-stack computes a stack.xml file from a list of packages - in a directory. - - - Ken Conley/kwc@willowgarage.com - BSD - - http://ros.org/wiki/roscreate - - - - - - - - diff --git a/tools/roscreate/setup.py b/tools/roscreate/setup.py index 3af16fc2..7d2dacc0 100644 --- a/tools/roscreate/setup.py +++ b/tools/roscreate/setup.py @@ -7,6 +7,6 @@ d = parse_package_for_distutils() d['packages'] = ['roscreate'] d['package_dir'] = {'': 'src'} d['scripts'] = ['scripts/roscreate-pkg'] -d['install_requires'] = ['rospkg'] +d['install_requires'] = ['roslib', 'rospkg'] setup(**d) diff --git a/tools/rosmake/manifest.xml b/tools/rosmake/manifest.xml deleted file mode 100644 index 39f2d9a8..00000000 --- a/tools/rosmake/manifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - rosmake is a ros dependency aware build tool which can be used to - build all dependencies in the correct order. - - - Tully Foote/tfoote@willowgarage.com - BSD - - http://ros.org/wiki/rosmake - - - - - - - - diff --git a/tools/rosmake/package.xml b/tools/rosmake/package.xml index bcf30e7f..245dd20a 100644 --- a/tools/rosmake/package.xml +++ b/tools/rosmake/package.xml @@ -9,7 +9,6 @@ BSD http://ros.org/wiki/rosmake - Tully Foote catkin diff --git a/tools/rosunit/CMakeLists.txt b/tools/rosunit/CMakeLists.txt index 81045563..17f521bb 100644 --- a/tools/rosunit/CMakeLists.txt +++ b/tools/rosunit/CMakeLists.txt @@ -6,12 +6,11 @@ catkin_package(CFG_EXTRAS ${PROJECT_NAME}-extras.cmake) catkin_python_setup() install(PROGRAMS - scripts/test_results_dir.py - scripts/summarize_results.py - scripts/rosunit - scripts/pycoverage_to_html.py - scripts/clean_junit_xml.py scripts/check_test_ran.py + scripts/clean_junit_xml.py + scripts/pycoverage_to_html.py + scripts/summarize_results.py + scripts/test_results_dir.py DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) catkin_add_nosetests(test) diff --git a/tools/rosunit/manifest.xml b/tools/rosunit/manifest.xml deleted file mode 100644 index 5cb1c994..00000000 --- a/tools/rosunit/manifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Unit-testing package for ROS. This is a lower-level library for rostest and handles unit tests, whereas rostest handles integration tests. - - - Ken Conley - BSD - - http://ros.org/wiki/rosunit - - - - - - - - diff --git a/tools/rosunit/package.xml b/tools/rosunit/package.xml index 4d1a5e04..9f99473d 100644 --- a/tools/rosunit/package.xml +++ b/tools/rosunit/package.xml @@ -10,7 +10,6 @@ http://ros.org/wiki/rosunit https://code.ros.org/trac/ros/query?status=assigned&status=new&status=reopened&component=ros&order=priority https://code.ros.org/svn/ros/stacks/ros/trunk/tools/rosunit - Ken Conley catkin