Skip to content

Commit

Permalink
Merge pull request #117 from gavanderhoorn/pkg_rename
Browse files Browse the repository at this point in the history
Fix for issue #89: make package name consistent with directory name
  • Loading branch information
Levi-Armstrong authored Aug 25, 2016
2 parents 94f7615 + 2474ac3 commit b3fb17f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion urdf_editor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(urdf_builder)
project(urdf_editor)

find_package(catkin REQUIRED
COMPONENTS
Expand Down
4 changes: 2 additions & 2 deletions urdf_editor/launch/start.launch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<arg name="debug_new_win" default="true" />

<arg if="$(arg debug)" name="launch_prefix"
value="gdb -x $(find urdf_builder)/launch/gdb_settings.gdb --ex run --args" />
value="gdb -x $(find urdf_editor)/launch/gdb_settings.gdb --ex run --args" />
<arg unless="$(arg debug)" name="launch_prefix" value="" />

<!-- bit of a dance to only start in a new window if 'debug == true'
Expand All @@ -18,6 +18,6 @@
value="$(arg launch_prefix2) $(arg launch_prefix)" />
<arg unless="$(arg debug)" name="launch_prefix3" value="$(arg launch_prefix)" />

<node name="urdf_editor" pkg="urdf_builder" type="urdf_builder" required="true"
<node name="urdf_editor" pkg="urdf_editor" type="urdf_editor" required="true"
launch-prefix="$(arg launch_prefix3)" output="screen"/>
</launch>
2 changes: 1 addition & 1 deletion urdf_editor/package.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<package>
<name>urdf_builder</name>
<name>urdf_editor</name>
<version>0.0.1</version>
<description>
This is an editor for creating and modifying urdf files.
Expand Down
2 changes: 1 addition & 1 deletion urdf_editor/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ int main(int argc, char *argv[])
{
if (!ros::isInitialized())
{
ros::init(argc, argv, "urdf_builder");
ros::init(argc, argv, "urdf_editor");
}

QApplication a(argc, argv);
Expand Down

0 comments on commit b3fb17f

Please sign in to comment.