Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address #14. Remove launch file. #102

Merged
merged 5 commits into from
Dec 1, 2021
Merged

Address #14. Remove launch file. #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f9a623
Address #14. Remove launch file.
arjo129 Dec 1, 2021
9ce5353
remove last reference to launch file
arjo129 Dec 1, 2021
9221b59
no need launch hooks
arjo129 Dec 1, 2021
5ebcde4
remove references to launch
arjo129 Dec 1, 2021
5c5a9d2
Remove ign-launch plugin path
chapulina Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion docker/empty_world/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
3 changes: 0 additions & 3 deletions lrauv_ignition_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down Expand Up @@ -309,7 +307,6 @@ endif()
install(
DIRECTORY
data
launch
models
worlds
${CMAKE_CURRENT_BINARY_DIR}/hooks
Expand Down
3 changes: 0 additions & 3 deletions lrauv_ignition_plugins/hooks/hook.dsv.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
96 changes: 0 additions & 96 deletions lrauv_ignition_plugins/launch/lrauv_world.ign
View file
Open in desktop

This file was deleted.