A wide array of install-related fixes.

CMakeLists.txt

@@ -31,21 +31,32 @@ add_nosetests(tools/roscreate/test)
 install(DIRECTORY core/rosbuild/
   DESTINATION share/ros/core/rosbuild
   PATTERN ".svn" EXCLUDE
+  PATTERN "bin" EXCLUDE
   )
+install(PROGRAMS 
+        core/rosbuild/bin/check_same_directories.py
+        core/rosbuild/bin/download_checkmd5.py
+        DESTINATION share/ros/core/rosbuild/bin)
 install(DIRECTORY core/mk/
   DESTINATION share/ros/core/mk
   PATTERN ".svn" EXCLUDE
   )
+install(FILES core/roslang/cmake/roslang.cmake
+        DESTINATION share/roslang/cmake)
 
 # install all manifests
 message("TODO: exclude rosbuild/manifest.xml and mk/manifest.xml from install_matching_to_share(), because the parent directories are installed explicitly")
 install_matching_to_share(manifest.xml)
 
 # install python package-relative scripts
-install(DIRECTORY tools/rosunit/scripts/
-  DESTINATION share/rosunit/bin
-  PATTERN ".svn" EXCLUDE
-  )
+install(PROGRAMS 
+        tools/rosunit/scripts/test_results_dir.py
+        tools/rosunit/scripts/summarize_results.py
+        tools/rosunit/scripts/rosunit
+        tools/rosunit/scripts/pycoverage_to_html.py
+        tools/rosunit/scripts/clean_junit_xml.py
+        tools/rosunit/scripts/check_test_ran.py
+        DESTINATION share/rosunit/bin)
 install(DIRECTORY tools/roscreate/templates/
   DESTINATION share/roscreate/templates
   PATTERN ".svn" EXCLUDE

core/rosbuild/private.cmake

@@ -62,17 +62,6 @@ macro(_rosbuild_list_find _list _item _idx)
     endforeach(_i)
 endmacro(_rosbuild_list_find)
 
-# Check validity of PYTHONPATH, to avoid esoteric build errors, #954.
-macro(_rosbuild_check_pythonpath)
-  if("$ENV{PYTHONPATH}" STREQUAL "")
-    message("WARNING: PYTHONPATH is not set.  This is almost certainly wrong. Check the ROS installation instructions for details on setting PYTHONPATH.")
-  else("$ENV{PYTHONPATH}" STREQUAL "")
-    if(NOT "$ENV{PYTHONPATH}" MATCHES ".*roslib.*")
-      message("WARNING: PYTHONPATH does not appear to contain roslib.  This is almost certainly wrong. Check the ROS installation instructions for details on setting PYTHONPATH.")
-    endif(NOT "$ENV{PYTHONPATH}" MATCHES ".*roslib.*")
-  endif("$ENV{PYTHONPATH}" STREQUAL "")
-endmacro(_rosbuild_check_pythonpath)
-
 # Check validity of manifest.xml, to avoid esoteric build errors
 macro(_rosbuild_check_manifest)
   execute_process(

core/rosbuild/public.cmake

@@ -169,9 +169,6 @@ macro(rosbuild_init)
   # PROJECT_SOURCE_DIR
   include($ENV{ROS_ROOT}/core/rosbuild/rosconfig.cmake)
 
-  # Check that PYTHONPATH includes roslib
-  _rosbuild_check_pythonpath()
-
   # Check that manifest.xml is valid
   _rosbuild_check_manifest()
 
@@ -297,12 +294,12 @@ macro(rosbuild_init)
   rosbuild_invoke_rospack("" rosunit path find rosunit)
 
   # Record where we're going to put test results (#2003)
-  execute_process(COMMAND ${rosunit_path}/scripts/test_results_dir.py
+  execute_process(COMMAND ${rosunit_path}/bin/test_results_dir.py
                   OUTPUT_VARIABLE rosbuild_test_results_dir
                   RESULT_VARIABLE _test_results_dir_failed
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(_test_results_dir_failed)
-    message(FATAL_ERROR "Failed to invoke rosunit/scripts/test_results_dir.py")
+    message(FATAL_ERROR "Failed to invoke rosunit/bin/test_results_dir.py")
   endif(_test_results_dir_failed)
 
   # The 'tests' target builds the test program

tools/rosbash/15.rosbash.bash.in

@@ -1,2 +1,2 @@
-. @CMAKE_INSTALL_PREFIX@/ros/tools/rosbash/rosbash
+. @CMAKE_INSTALL_PREFIX@/share/rosbash/rosbash
 

tools/rosbash/15.rosbash.zsh.in

@@ -1,2 +1,2 @@
-. @CMAKE_INSTALL_PREFIX@/ros/tools/rosbash/roszsh
+. @CMAKE_INSTALL_PREFIX@/share/rosbash/roszsh
 

tools/rosbash/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(rosbash)
 install(FILES rosbash rostcsh roszsh
-        DESTINATION share/ros/rosbash)
+        DESTINATION share/rosbash)
 install(PROGRAMS scripts/rosrun
         DESTINATION bin)
 if(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/rosrun)