Merge pull request #7 from gavanderhoorn/issue6_source_vs_devel_vs_in…

…stall Fix issue #6: No robot model when using display.launch (again)
ros · Jan 9, 2014 · 766363b · 766363b
2 parents 23b3709 + 15d5a08
commit 766363b
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,5 +4,11 @@ project(urdf_tutorial)
 find_package(catkin)
 catkin_package()
 
-install(DIRECTORY urdf_tutorial/
+foreach(dir images launch urdf)
+  install(DIRECTORY ${dir}/
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
+endforeach(dir)
+
+install(
+  FILES urdf.rviz urdf.vcg
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/urdf_tutorial/images/flexible.png → images/flexible.png b/urdf_tutorial/images/flexible.png → images/flexible.png
diff --git a/urdf_tutorial/images/materials.png → images/materials.png b/urdf_tutorial/images/materials.png → images/materials.png
diff --git a/urdf_tutorial/images/multipleshapes.png → images/multipleshapes.png b/urdf_tutorial/images/multipleshapes.png → images/multipleshapes.png
diff --git a/urdf_tutorial/images/myfirst.png → images/myfirst.png b/urdf_tutorial/images/myfirst.png → images/myfirst.png
diff --git a/urdf_tutorial/images/origins.png → images/origins.png b/urdf_tutorial/images/origins.png → images/origins.png
diff --git a/urdf_tutorial/images/visual.png → images/visual.png b/urdf_tutorial/images/visual.png → images/visual.png
diff --git a/urdf_tutorial/display.launch → launch/display.launch b/urdf_tutorial/display.launch → launch/display.launch
@@ -5,5 +5,5 @@
 	<param name="use_gui" value="$(arg gui)"/>
 	<node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
 	<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
-	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find urdf_tutorial)/urdf_tutorial/urdf.rviz" required="true" />
+	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find urdf_tutorial)/urdf.rviz" required="true" />
 </launch>
diff --git a/urdf_tutorial/gazebo.launch → launch/gazebo.launch b/urdf_tutorial/gazebo.launch → launch/gazebo.launch
diff --git a/urdf_tutorial/xacrodisplay.launch → launch/xacrodisplay.launch b/urdf_tutorial/xacrodisplay.launch → launch/xacrodisplay.launch
@@ -5,5 +5,5 @@
 	<param name="use_gui" value="$(arg gui)"/>
 	<node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
 	<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
-	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find urdf_tutorial)/urdf_tutorial/urdf.rviz" required="true" />
+	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find urdf_tutorial)/urdf.rviz" required="true" />
 </launch>
diff --git a/urdf_tutorial/urdf.rviz → urdf.rviz b/urdf_tutorial/urdf.rviz → urdf.rviz
diff --git a/urdf_tutorial/urdf.vcg → urdf.vcg b/urdf_tutorial/urdf.vcg → urdf.vcg
diff --git a/urdf_tutorial/01-myfirst.urdf → urdf/01-myfirst.urdf b/urdf_tutorial/01-myfirst.urdf → urdf/01-myfirst.urdf
diff --git a/urdf_tutorial/02-multipleshapes.urdf → urdf/02-multipleshapes.urdf b/urdf_tutorial/02-multipleshapes.urdf → urdf/02-multipleshapes.urdf
diff --git a/urdf_tutorial/03-origins.urdf → urdf/03-origins.urdf b/urdf_tutorial/03-origins.urdf → urdf/03-origins.urdf
diff --git a/urdf_tutorial/04-materials.urdf → urdf/04-materials.urdf b/urdf_tutorial/04-materials.urdf → urdf/04-materials.urdf
diff --git a/urdf_tutorial/05-visual.urdf → urdf/05-visual.urdf b/urdf_tutorial/05-visual.urdf → urdf/05-visual.urdf
diff --git a/urdf_tutorial/06-flexible.urdf → urdf/06-flexible.urdf b/urdf_tutorial/06-flexible.urdf → urdf/06-flexible.urdf
diff --git a/urdf_tutorial/07-physics.urdf → urdf/07-physics.urdf b/urdf_tutorial/07-physics.urdf → urdf/07-physics.urdf
diff --git a/urdf_tutorial/08-macroed.urdf.xacro → urdf/08-macroed.urdf.xacro b/urdf_tutorial/08-macroed.urdf.xacro → urdf/08-macroed.urdf.xacro
diff --git a/urdf_tutorial/r2d2.xacro → urdf/r2d2.xacro b/urdf_tutorial/r2d2.xacro → urdf/r2d2.xacro