restructuring and install tags

DAInamite · Mar 30, 2014 · 2a425d4 · 2a425d4
1 parent b78fa46
commit 2a425d4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/cob_robot_calibration_est/CMakeLists.txt b/cob_robot_calibration_est/CMakeLists.txt
@@ -3,12 +3,32 @@ project(cob_robot_calibration_est)
 
 find_package(catkin REQUIRED COMPONENTS)
 
-#catkin_python_setup()
+catkin_python_setup()
 
 catkin_package()
 
 
 ###install tags
-#install(DIRECTORY launch
-  #DESTINATIN ${CATKIN_PACKAGE_SHARE_DESTINATION}
-#)
+install(PROGRAMS src/multi_step_cov_estimator.py
+                 src/multi_step_estimator.py
+  DESTINATIN ${CATKIN_PACKAGE_BIN_DESTINATION}/src
+)
+
+install(PROGRAMS test/camera_chain_sensor_unittest.py
+                 test/camera_unittest.py
+                 test/chain_sensor_unittest.py
+                 test/checkerboard_unittest.py
+                 test/dh_chain_unittest.py
+                 test/full_chain_dh_vs_fk_arm_unittest.py
+                 test/full_chain_dh_vs_fk_unittest.py
+                 test/full_chain_unittest.py
+                 test/robot_params_unittest.py
+                 test/single_transform_unittest.py
+                 test/torso_chain_test.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}/test
+)
+
+install(DIRECTROY test/data
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test
+)
+
diff --git a/cob_robot_calibration_est/setup.py b/cob_robot_calibration_est/setup.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+from catkin_pkg.python_setup import generate_distutils_setup
+
+d = generate_distutils_setup(
+   packages=['cob_robot_calibration_est'],
+   package_dir={'': 'src'}
+)
+
+setup(**d)
diff --git a/cob_robot_calibration_est/src/cob_robot_calibration_est/opt_runner.py b/cob_robot_calibration_est/src/cob_robot_calibration_est/opt_runner.py
diff --git a/...libration_est/multi_step_cov_estimator.py → ...ation_est/src/multi_step_cov_estimator.py b/...libration_est/multi_step_cov_estimator.py → ...ation_est/src/multi_step_cov_estimator.py
diff --git a/...t_calibration_est/multi_step_estimator.py → ...libration_est/src/multi_step_estimator.py b/...t_calibration_est/multi_step_estimator.py → ...libration_est/src/multi_step_estimator.py