rosunit: removing load_manifests

tools/rosunit/CMakeLists.txt

@@ -1,35 +1,11 @@
-if(ROSBUILD)
+project(rosnode)
-  # this is for rosbuild2 integration, you can ignore this
+find_package(catkin)
-  include(rosbuild.cmake OPTIONAL)
-  return()
-endif()
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 
-# Set the build type.  Options are:
+add_subdirectory(scripts)
-#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
-#  Debug          : w/ debug symbols, w/o optimization
-#  Release        : w/o debug symbols, w/ optimization
-#  RelWithDebInfo : w/ debug symbols, w/ optimization
-#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
-#set(ROS_BUILD_TYPE RelWithDebInfo)
 
-rosbuild_init()
+install_cmake_infrastructure(${PROJECT_NAME}
+  VERSION 0.0.1
+  PYTHONPATH src
+  )
 
-#set the default path for built executables to the "bin" directory
+enable_python(${PROJECT_NAME})
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-#set the default path for built libraries to the "lib" directory
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
-#uncomment if you have defined messages
-#rosbuild_genmsg()
-#uncomment if you have defined services
-#rosbuild_gensrv()
-
-#common commands for building c++ executables and libraries
-#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
-#target_link_libraries(${PROJECT_NAME} another_library)
-#rosbuild_add_boost_directories()
-#rosbuild_link_boost(${PROJECT_NAME} thread)
-#rosbuild_add_executable(example examples/example.cpp)
-#target_link_libraries(example ${PROJECT_NAME})

tools/rosunit/Makefile

@@ -1 +0,0 @@
-include $(shell rospack find mk)/cmake.mk

tools/rosunit/manifest.xml

@@ -14,9 +14,6 @@
     <rosdoc config="rosdoc.yaml" />
   </export>
   <rosdep name="gtest"/> 
-  <rosbuild2>
-    <depend package="roslib"/>
-  </rosbuild2>
 
 </package>
 

tools/rosunit/scripts/check_test_ran.py

@@ -38,9 +38,8 @@ Writes a test failure out to test file if it doesn't exist.
 """
 
 from __future__ import print_function
-PKG='rosunit'
 NAME="check_test_ran.py"
-import roslib; roslib.load_manifest(PKG)
+
 import os
 import sys
 

tools/rosunit/scripts/clean_junit_xml.py

@@ -43,7 +43,6 @@ tend to cause Hudson trouble.
 """
 
 PKG = 'rosunit'
-import roslib; roslib.load_manifest(PKG)
 
 import os
 import sys

tools/rosunit/scripts/pycoverage_to_html.py

@@ -38,8 +38,6 @@ Generate HTML reports from coverage.py (aka python-coverage). This is
 currently a no-frills backend tool.
 """
 
-from __future__ import with_statement
-
 import sys
 import roslib
 

tools/rosunit/scripts/summarize_results.py

@@ -38,10 +38,6 @@ Prints summary of aggregated test results to stdout. This is useful
 when running several tests across a package.
 """
 
-
-PKG = 'rosunit'
-import roslib; roslib.load_manifest(PKG)
-
 import os
 import sys
 import cStringIO

tools/rosunit/src/rosunit/__init__.py

@@ -39,10 +39,10 @@ Library and tools support unit testing in ROS.
 # NOTE: while this makes some forward references to conventions used
 # in rostest, it does not use rostest itself.
 import os
-import roslib
 
 from .core import xml_results_file, rostest_name_from_path, create_xml_runner, XML_OUTPUT_FLAG
 from . import junitxml
 from .baretest import print_runner_summary, print_unittest_summary
 from .pyunit import unitrun
 
+__version__ = '1.7.0'