Address #14. Remove launch file. (#102)

Signed-off-by: Arjo Chakravarty <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
osrf · Dec 1, 2021 · 7b8428d · 7b8428d
1 parent f0bef55
commit 7b8428d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ This package comes with an empty example world. To run this example world simply
 source the colcon workspace and run:
 ```
 . install/setup.bash
-ign launch lrauv_world.ign
+ign gazebo buoyant_tethys.sdf
 ```
 
 Send example commands to move some joints:
@@ -139,7 +139,7 @@ Alternatively, they can be changed prior to compilation in the world SDF under
 
 Launch the Ignition simulation:
 ```
-ign launch lrauv_world.ign
+ign gazebo buoyant_tethys.sdf
 ```
 For verbose debug output, add `--verbose 4`.
 

diff --git a/docker/empty_world/Dockerfile b/docker/empty_world/Dockerfile
@@ -110,4 +110,4 @@ SHELL ["/bin/bash", "-c"]
 # start ignition
 ENTRYPOINT [ "/bin/bash" , "-c" , \
   "source /home/colcon_ws/install/setup.bash \
-  && ign launch lrauv_world.ign" ]
+  && ign gazebo buoyant_tethys.sdf" ]
diff --git a/lrauv_ignition_plugins/CMakeLists.txt b/lrauv_ignition_plugins/CMakeLists.txt
@@ -29,8 +29,6 @@ set(IGN_GUI_VER ${ignition-gui6_VERSION_MAJOR})
 find_package(ignition-sensors6 REQUIRED)
 set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})
 
-find_package(ignition-launch5 REQUIRED)
-
 find_package(ignition-msgs8 REQUIRED)
 set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
 
@@ -309,7 +307,6 @@ endif()
 install(
   DIRECTORY
     data
-    launch
     models
     worlds
     ${CMAKE_CURRENT_BINARY_DIR}/hooks

diff --git a/lrauv_ignition_plugins/hooks/hook.dsv.in b/lrauv_ignition_plugins/hooks/hook.dsv.in
@@ -1,6 +1,3 @@
-prepend-non-duplicate;IGN_LAUNCH_CONFIG_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/launch
-prepend-non-duplicate;IGN_LAUNCH_PLUGIN_PATH;@CMAKE_INSTALL_PREFIX@/lib
-
 prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/worlds
 prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/models
 prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/data

diff --git a/lrauv_ignition_plugins/launch/lrauv_world.ign b/lrauv_ignition_plugins/launch/lrauv_world.ign