use catkin_add_hook for ROSLIB environment

Author: OTL

CMakeLists.txt

@@ -3,8 +3,6 @@ project(rosruby)
 
 find_package(catkin REQUIRED COMPONENTS)
 
-find_package(Ruby)
-
 catkin_package(
   CATKIN_DEPENDS roslang rosgraph_msgs
   DEPENDS ruby
@@ -44,6 +42,7 @@ endmacro()
 
 rosruby_setup()
 
+catkin_add_env_hooks(rosruby SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
 rosruby_generate_messages(rosgraph_msgs std_msgs roscpp_tutorials)
 
 add_custom_target(rosruby_devel_mkdir ALL

README.md

@@ -29,13 +29,6 @@ If you want to use groovy,
 sudo apt-get install ros-groovy-rosruby
 ```
 
-and add RUBYLIB environmental variable.
-
-```bash
-$ echo "export RUBYLIB=/opt/ros/groovy/lib/ruby/vendor_ruby" >> ~/.bashrc
-$ source ~/.bashrc
-```
-
 Install from source
 ---------------
 Install ROS and ruby first. ROS document is [http://ros.org/wiki/ROS/Installation](http://ros.org/wiki/ROS/Installation) .
@@ -50,21 +43,18 @@ $ cd ~/catkin_ws
 $ catkin_make
 ```
 
-please add RUBYLIB environment variable, like below (if you are using bash).
 
-```bash
-$ echo "export RUBYLIB=~/catkin_ws/devel/lib/ruby/vendor_ruby" >> ~/.bashrc
-$ source ~/.bashrc
-```
-
-if you want to use install environment, please edit develop -> install
+Message generation
+-----------------------
+You must generate ROS msg/srv files for rosruby.
+If you are using catkin package, it is easy.
+Please add below to your package CMakeLists.txt.
 
-export RUBYLIB=~/catkin_ws/install/lib/ruby/vendor_ruby
+    find_package(rosruby)
+    rosruby_generate_messages(message_pkg1 message_okg2 ...)
 
 
-Message generation
------------------------
-You must generate ROS msg/srv files for rosruby manually.
+You can generate it manually. (not recomended)
 Please use the msg/srv generation script (rosruby_genmsg.py) in order to 
 generage rosruby messages.
 

env-hooks/rosruby.sh.em

@@ -0,0 +1,7 @@
+@[if DEVELSPACE]@
+# env variables in develspace
+export RUBYLIB="@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_LIB_DESTINATION)/ruby/vendor_ruby":"$RUBYLIB"
+@[else]@
+# env variables in installspace
+export RUBYLIB="$CATKIN_ENV_HOOK_WORKSPACE/@(CATKIN_GLOBAL_LIB_DESTINATION)/ruby/vendor_ruby":"$RUBYLIB"
+@[end if]@