Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/docker/ddsenabler/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ RUN echo "fastcdr branch: <${fastcdr_branch}>" && \
echo "ddsenabler branch: <${ddsenabler_branch}>"

RUN mkdir src && \
wget https://raw.githubusercontent.com/eProsima/FIWARE-DDS-Enabler/${ddsenabler_branch}/ddsenabler.repos && \
wget https://raw.githubusercontent.com/eProsima/DDS-Enabler/${ddsenabler_branch}/ddsenabler.repos && \
vcs import src < ddsenabler.repos && \
cd src/fastcdr && git checkout ${fastcdr_branch} && cd ../.. && \
cd src/fastdds && git checkout ${fastdds_branch} && cd ../.. && \
cd src/dev-utils && git checkout ${devutils_branch} && cd ../.. && \
cd src/ddspipe && git checkout ${ddspipe_branch} && cd ../.. && \
cd src/ddsenabler && git checkout ${ddsenabler_branch} && cd ../.. && \
cp -r src/fastdds/examples/cpp/configuration src/. && \
cd src/Fast-CDR && git checkout ${fastcdr_branch} && cd ../.. && \
cd src/Fast-DDS && git checkout ${fastdds_branch} && cd ../.. && \
cd src/Dev-Utils && git checkout ${devutils_branch} && cd ../.. && \
cd src/DDS-Pipe && git checkout ${ddspipe_branch} && cd ../.. && \
cd src/DDS-Enabler && git checkout ${ddsenabler_branch} && cd ../.. && \
cp -r src/Fast-DDS/examples/cpp/configuration src/. && \
colcon build --packages-skip ddsenabler ddsenabler_docs --event-handlers console_direct+ --cmake-args -DLOG_INFO=ON -DSECURITY=ON && \
colcon build --packages-select ddsenabler --event-handlers console_direct+ --cmake-args -DLOG_INFO=ON -DCOMPILE_EXAMPLES=ON

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/ddsenabler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
In order to build this docker image, use command in current directory:

```sh
docker build --rm -t ddsenabler_test:some_tag --build-arg "fastcdr_branch=master" --build-arg "fastdds_branch=master" --build-arg "devutils_branch=main" --build-arg "ddspipe_branch=tmp/dds_enabler" --build-arg "ddsenabler_branch=CI" .
docker build --rm -t ddsenabler_test:some_tag --build-arg "fastcdr_branch=master" --build-arg "fastdds_branch=master" --build-arg "devutils_branch=main" --build-arg "ddspipe_branch=main" --build-arg "ddsenabler_branch=main" .
```
2 changes: 1 addition & 1 deletion .github/workflows/docker-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
type: string

ddsenabler_branch:
description: 'Branch or tag of DDS Enabler repository (https://github.com/eProsima/FIWARE-DDS-Enabler)'
description: 'Branch or tag of DDS Enabler repository (https://github.com/eProsima/DDS-Enabler)'
required: true
default: 'main'
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
type: string

ddsenabler_branch:
description: 'Branch or tag of DDS Enabler repository (https://github.com/eProsima/FIWARE-DDS-Enabler)'
description: 'Branch or tag of DDS Enabler repository (https://github.com/eProsima/DDS-Enabler)'
required: true
default: 'main'
type: string
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![DDS Enabler](resources/images/github_banner_ddsenabler.png)](https://eprosima.com/middleware/tools/fiware-dds-enabler)
[![DDS Enabler](resources/images/github_banner_ddsenabler.png)](https://eprosima.com/middleware/tools/DDS-Enabler)

<br>

Expand All @@ -19,15 +19,15 @@
<br><br>

<div class="badges" align="center">
<a href="https://opensource.org/licenses/Apache-2.0"><img alt="License" src="https://img.shields.io/github/license/eProsima/FIWARE-DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/releases"><img alt="Releases" src="https://img.shields.io/github/v/release/eProsima/FIWARE-DDS-Enabler?sort=semver"/></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/issues"><img alt="Issues" src="https://img.shields.io/github/issues/eProsima/FIWARE-DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/network/members"><img alt="Forks" src="https://img.shields.io/github/forks/eProsima/FIWARE-DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/stargazers"><img alt="Stars" src="https://img.shields.io/github/stars/eProsima/FIWARE-DDS-Enabler.svg"/></a>
<a href="https://opensource.org/licenses/Apache-2.0"><img alt="License" src="https://img.shields.io/github/license/eProsima/DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/DDS-Enabler/releases"><img alt="Releases" src="https://img.shields.io/github/v/release/eProsima/DDS-Enabler?sort=semver"/></a>
<a href="https://github.com/eProsima/DDS-Enabler/issues"><img alt="Issues" src="https://img.shields.io/github/issues/eProsima/DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/DDS-Enabler/network/members"><img alt="Forks" src="https://img.shields.io/github/forks/eProsima/DDS-Enabler.svg"/></a>
<a href="https://github.com/eProsima/DDS-Enabler/stargazers"><img alt="Stars" src="https://img.shields.io/github/stars/eProsima/DDS-Enabler.svg"/></a>
<br>
<a href="https://dds-enabler.readthedocs.io"><img alt="Documentation badge" src="https://img.shields.io/readthedocs/dds-enabler.svg"/></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/actions/workflows/nightly-windows-ci.yml"><img alt="Windows CI" src="https://img.shields.io/github/actions/workflow/status/eProsima/FIWARE-DDS-Enabler/nightly-windows-ci.yml?label=Windows%20CI"></a>
<a href="https://github.com/eProsima/FIWARE-DDS-Enabler/actions/workflows/nightly-ubuntu-ci.yml"><img alt="Ubuntu CI" src="https://img.shields.io/github/actions/workflow/status/eProsima/FIWARE-DDS-Enabler/nightly-ubuntu-ci.yml?label=Ubuntu%20CI"></a>
<a href="https://github.com/eProsima/DDS-Enabler/actions/workflows/nightly-windows-ci.yml"><img alt="Windows CI" src="https://img.shields.io/github/actions/workflow/status/eProsima/DDS-Enabler/nightly-windows-ci.yml?label=Windows%20CI"></a>
<a href="https://github.com/eProsima/DDS-Enabler/actions/workflows/nightly-ubuntu-ci.yml"><img alt="Ubuntu CI" src="https://img.shields.io/github/actions/workflow/status/eProsima/DDS-Enabler/nightly-ubuntu-ci.yml?label=Ubuntu%20CI"></a>
</div>

<br><br>
Expand Down
12 changes: 6 additions & 6 deletions ddsenabler.repos
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ repositories:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: v1.3.1
fastcdr:
Fast-CDR:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master
fastdds:
Fast-DDS:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: master
dev-utils:
Dev-Utils:
type: git
url: https://github.com/eProsima/dev-utils.git
version: main
ddspipe:
DDS-Pipe:
type: git
url: https://github.com/eProsima/DDS-Pipe.git
version: main
ddsenabler:
DDS-Enabler:
type: git
url: https://github.com/eProsima/FIWARE-DDS-Enabler.git
url: https://github.com/eProsima/DDS-Enabler.git
version: main
4 changes: 2 additions & 2 deletions ddsenabler/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
<url type="bugtracker">https://github.com/eProsima/FIWARE-DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/FIWARE-DDS-Enabler</url>
<url type="bugtracker">https://github.com/eProsima/DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/DDS-Enabler</url>

<buildtool_depend>cmake</buildtool_depend>

Expand Down
5 changes: 3 additions & 2 deletions ddsenabler_docs/docs/ddsenabler/installation/linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ Colcon installation (recommended)

Being based on CMake_, it is possible to pass the CMake configuration options to the :code:`colcon build` command.
For more information on the specific syntax, please refer to the `CMake specific arguments <https://colcon.readthedocs.io/en/released/reference/verb/build.html#cmake-specific-arguments>`_ page of the colcon_ manual.
To see the specific option for the *eProsima DDS Enabler* packages, please refer to the :ref:`cmake_options` section.


.. _cmake_installation:
Expand Down Expand Up @@ -284,8 +285,8 @@ To run this *eProsima DDS Enabler* example, source the installation path and exe
# If built has been done using colcon, all projects could be sourced as follows
cd <dds-enabler-workspace>
source install/setup.bash
export TEST_PATH=$PWD/src/FIWARE-DDS-Enabler/ddsenabler_test/compose/test_cases/publish/discovered_type
./build/ddsenabler/examples/ddsenabler_example --config $TEST_PATH/config.yml --timeout 5 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 2000
export TEST_PATH=$PWD/src/DDS-Enabler/ddsenabler_test/compose/test_cases/publish/discovered_type
./build/ddsenabler/examples/ddsenabler_example --config $TEST_PATH/config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000

.. important::

Expand Down
20 changes: 18 additions & 2 deletions ddsenabler_docs/docs/ddsenabler/installation/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ Colcon installation (recommended)
mkdir <path\to\user\workspace>\DDS-Enabler
cd <path\to\user\workspace>\DDS-Enabler
mkdir src
wget https://raw.githubusercontent.com/eProsima/DDS-Enabler/main/ddsenabler.repos ddsenabler.repos
vcs import src < ddsenabler.repos
wget https://raw.githubusercontent.com/eProsima/DDS-Enabler/main/ddsenabler.repos -output ddsenabler.repos
vcs import src --input ddsenabler.repos

.. note::

Expand All @@ -216,6 +216,7 @@ Colcon installation (recommended)

Being based on CMake_, it is possible to pass the CMake configuration options to the :code:`colcon build` command.
For more information on the specific syntax, please refer to the `CMake specific arguments <https://colcon.readthedocs.io/en/released/reference/verb/build.html#cmake-specific-arguments>`_ page of the colcon_ manual.
To see the specific option for the *eProsima DDS Enabler* packages, please refer to the :ref:`cmake_options` section.


.. _windows_sources_cmake_installation:
Expand Down Expand Up @@ -381,6 +382,21 @@ There are two possibilities:

* Add the sourcing of the colcon overlay permanently, by opening the *Edit the system environment variables* control panel, and adding the installation path to the :code:`PATH`.

.. code-block:: bash

# TERMINAL ROS2 LISTENER
ROS_DOMAIN_ID=33 ros2 run demo_nodes_cpp listener

# TERMINAL DDS ENABLER
# If built has been done using colcon, all projects could be sourced as follows
cd <dds-enabler-workspace>
.\install\setup.bat
set TEST_PATH=%CD%\src\DDS-Enabler\ddsenabler_test\compose\test_cases\publish\discovered_type
.\install\ddsenabler\bin\ddsenabler_example.exe --config %TEST_PATH%\config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path %TEST_PATH%\samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000

.. important::

To run the *eProsima DDS Enabler* examples, it is necessary to have compiled the *eProsima DDS Enabler* project with the CMake option ``-DCOMPILE_EXAMPLES=ON``. For more details, please refer to the :ref:`cmake_options` section.

.. External links

Expand Down
4 changes: 2 additions & 2 deletions ddsenabler_docs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
<url type="bugtracker">https://github.com/eProsima/FIWARE-DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/FIWARE-DDS-Enabler</url>
<url type="bugtracker">https://github.com/eProsima/DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/DDS-Enabler</url>

<buildtool_depend>cmake</buildtool_depend>

Expand Down
4 changes: 2 additions & 2 deletions ddsenabler_participants/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
<url type="bugtracker">https://github.com/eProsima/FIWARE-DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/FIWARE-DDS-Enabler</url>
<url type="bugtracker">https://github.com/eProsima/DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/DDS-Enabler</url>

<buildtool_depend>cmake</buildtool_depend>

Expand Down
4 changes: 2 additions & 2 deletions ddsenabler_test/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
<url type="bugtracker">https://github.com/eProsima/FIWARE-DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/FIWARE-DDS-Enabler</url>
<url type="bugtracker">https://github.com/eProsima/DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/DDS-Enabler</url>

<buildtool_depend>cmake</buildtool_depend>

Expand Down
4 changes: 2 additions & 2 deletions ddsenabler_yaml/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
<url type="bugtracker">https://github.com/eProsima/FIWARE-DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/FIWARE-DDS-Enabler</url>
<url type="bugtracker">https://github.com/eProsima/DDS-Enabler/issues</url>
<url type="repository">https://github.com/eProsima/DDS-Enabler</url>

<buildtool_depend>cmake</buildtool_depend>

Expand Down