removing rospack dep and removing rosbuild2 stuff

core/roslib/catkin.cmake

@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(roslib)
-find_package(catkin)
-
-install_cmake_infrastructure(roslib
-  VERSION 0.0.1
-  PYTHONPATH src
-  )
-
-enable_python(roslib)

core/roslib/manifest.xml

@@ -12,7 +12,6 @@
     <cpp cflags="-I${prefix}/msg_gen/cpp/include -I${prefix}/include `rosboost-cfg --cflags`" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lroslib"/>
     <rosdoc config="${prefix}/rosdoc.yaml" />
   </export>
-  <depend package="rospack"/>
 
   <!-- for roslib.params -->
   <rosdep name="python"/>
@@ -24,12 +23,4 @@
   <platform os="ubuntu" version="9.10"/>
   <platform os="ubuntu" version="10.04"/>
   <platform os="macports" version="macports"/>
-  <rosbuild2> 
-    <depend package="rospack"/>
-    <depend package="cpp_common"/>
-    <export>
-      <include_dir>${roslib_SOURCE_DIR}/include</include_dir>
-      <lib>roslib</lib>
-    </export>
-  </rosbuild2>
 </package>

core/roslib/rosbuild.cmake

@@ -1,14 +0,0 @@
-include(${CMAKE_CURRENT_BINARY_DIR}/package.cmake)
-
-# Avoid a boost warning that pops up when using msvc compiler
-if(MSVC)
-  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-endif()
-rosbuild_add_boost_directories()
-rosbuild_add_library(roslib src/package.cpp)
-rosbuild_link_boost(roslib thread)
-
-if(NOT (APPLE OR WIN32 OR MINGW))
-  target_link_libraries(roslib rt)
-endif()
-

core/roslib/scripts/pythontest

@@ -1,12 +0,0 @@
-#!/bin/bash
-if [ ! -f /usr/bin/python ] ; then
-  exit 1
-fi
-
-python -c "import sys, os; os._exit(float(sys.version[:3])>=2.4);"
-if [ $? -eq 0 ]
-then
-  exit 1
-else
-  exit 0
-fi

core/roslib/setup.py

@@ -1,23 +1,18 @@
 #!/usr/bin/env python
-#
-#  TDS 2011/11/28
-#  PROTOTYPE FILE USED BY CATKIN
-#  IF YOU DON'T KNOW WHAT THAT MEANS, IGNORE THIS FILE
-#
 
 from setuptools import setup
 
 import sys
 sys.path.insert(0, 'src')
 
-#from genpy import __version__
+from roslib import __version__
 
 setup(name='roslib',
-      version= "6.6.6",
+      version= __version__,
       packages=['roslib'],
       package_dir = {'':'src'},
-      install_requires=[],
-      scripts = [],
+      install_requires=['rospkg'], 
+      scripts = ['scripts/gendeps'],
       author = "Ken Conley", 
       author_email = "kwc@willowgarage.com",
       url = "http://www.ros.org/wiki/roslib",
@@ -26,9 +21,9 @@ setup(name='roslib',
       classifiers = [
         "Programming Language :: Python", 
         "License :: OSI Approved :: BSD License" ],
-      description = "ROS msg/srv Python generation", 
+      description = "roslib", 
       long_description = """\
-roslib!
+This is a deprecated library that is being phased out starting in the ROS Fuerte release.  It contains 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.
 """,
       license = "BSD"
       )

core/roslib/src/roslib/packages.py

@@ -52,7 +52,6 @@ from subprocess import Popen, PIPE
 import rospkg
 
 import roslib.manifest
-import roslib.os_detect
 
 SRC_DIR = 'src'
 CATKIN_SOURCE_DIR = 'CATKIN_SOURCE_DIR'
@@ -143,11 +142,9 @@ def get_pkg_dir(package, required=True, ros_root=None, ros_package_path=None):
         elif ROS_ROOT in os.environ:
             # record setting for _pkg_dir_cache
             ros_root = os.environ[ROS_ROOT]
-        if ros_root:
-            rospack = os.path.join(ros_root, 'bin', 'rospack')
-        else:
-            rospack = 'rospack'
 
+        # determine rospack exe name
+        rospack = 'rospack'
         if 'ROS_BUILD' in os.environ:
             rospack = os.path.join(os.environ['ROS_BUILD'], 'bin', 'rospack')