Make it suitable for packaging

Author: wenwei-dev

CMakeLists.txt

@@ -18,7 +18,7 @@ find_package(catkin REQUIRED COMPONENTS
 ## Uncomment this if the package has a setup.py. This macro ensures
 ## modules and global scripts declared therein get installed
 ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
+catkin_python_setup()
 
 ################################################
 ## Declare ROS messages, services and actions ##
@@ -134,6 +134,11 @@ include_directories(
 #   scripts/my_python_script
 #   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 # )
+install(PROGRAMS
+  scripts/arms_alive.py
+  scripts/head_ctrl.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
 
 ## Mark executables and/or libraries for installation
 # install(TARGETS basic_head_api basic_head_api_node

package.xml

@@ -47,6 +47,7 @@
   <run_depend>rospy</run_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>dynamic_reconfigure</run_depend>
+  <run_depend>ros_pololu</run_depend>
 
   <!-- The export tag contains other, unspecified, tags -->
   <export>

src/arms_alive.py renamed to scripts/arms_alive.py

@@ -3,20 +3,20 @@
 import yaml
 import rospy
 from collections import OrderedDict
-import FaceExpr
-from animation import Animation
-from playback import Playback
 from ros_pololu.msg import MotorCommand
-from basic_head_api.srv import *
-from basic_head_api.msg import *
 from pau2motors.msg import pau
 from geometry_msgs.msg import Quaternion
 from pi_face_tracker.msg import Faces
-import Quat
 from std_msgs.msg import String
 from std_msgs.msg import Float64
 import time
 
+from basic_head_api import FaceExpr
+from basic_head_api.animation import Animation
+from basic_head_api.playback import Playback
+from basic_head_api.srv import *
+from basic_head_api.msg import *
+from basic_head_api import Quat
 
 def to_dict(list, key):
     result = {}

src/head_ctrl.py renamed to scripts/head_ctrl.py

@@ -0,0 +1,11 @@
+# DO NOT USE
+# python setup.py install
+
+from distutils.core import setup
+
+setup(
+    version='0.1.0',
+    name='basic_head_api',
+    packages=['basic_head_api'],
+    package_dir={'': 'src'}
+)