diff --git a/.github/docker/ddsenabler/Dockerfile b/.github/docker/ddsenabler/Dockerfile index e70a6f30..c085e8a0 100644 --- a/.github/docker/ddsenabler/Dockerfile +++ b/.github/docker/ddsenabler/Dockerfile @@ -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 diff --git a/.github/docker/ddsenabler/README.md b/.github/docker/ddsenabler/README.md index 0e437920..4b0962d9 100644 --- a/.github/docker/ddsenabler/README.md +++ b/.github/docker/ddsenabler/README.md @@ -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" . ``` diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml index 22753ac9..c9813d99 100644 --- a/.github/workflows/docker-reusable-workflow.yml +++ b/.github/workflows/docker-reusable-workflow.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9c78640..cb0c30de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/README.md b/README.md index 0e50d828..34318da7 100644 --- a/README.md +++ b/README.md @@ -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)
@@ -19,15 +19,15 @@

- License - Releases - Issues - Forks - Stars + License + Releases + Issues + Forks + Stars
Documentation badge - Windows CI - Ubuntu CI + Windows CI + Ubuntu CI


diff --git a/ddsenabler.repos b/ddsenabler.repos index 4531c129..89f512f4 100644 --- a/ddsenabler.repos +++ b/ddsenabler.repos @@ -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 diff --git a/ddsenabler/package.xml b/ddsenabler/package.xml index f5de072e..a31534a9 100644 --- a/ddsenabler/package.xml +++ b/ddsenabler/package.xml @@ -12,8 +12,8 @@ Apache 2.0 https://www.eprosima.com/ - https://github.com/eProsima/FIWARE-DDS-Enabler/issues - https://github.com/eProsima/FIWARE-DDS-Enabler + https://github.com/eProsima/DDS-Enabler/issues + https://github.com/eProsima/DDS-Enabler cmake diff --git a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst index 9f4c4ef1..d8b7c2cd 100644 --- a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst +++ b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst @@ -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 `_ 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: @@ -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 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:: diff --git a/ddsenabler_docs/docs/ddsenabler/installation/windows.rst b/ddsenabler_docs/docs/ddsenabler/installation/windows.rst index ac79c2fe..12887aeb 100644 --- a/ddsenabler_docs/docs/ddsenabler/installation/windows.rst +++ b/ddsenabler_docs/docs/ddsenabler/installation/windows.rst @@ -196,8 +196,8 @@ Colcon installation (recommended) mkdir \DDS-Enabler cd \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:: @@ -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 `_ 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: @@ -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 + .\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 diff --git a/ddsenabler_docs/package.xml b/ddsenabler_docs/package.xml index e8a70021..25946b52 100644 --- a/ddsenabler_docs/package.xml +++ b/ddsenabler_docs/package.xml @@ -13,8 +13,8 @@ Apache 2.0 https://www.eprosima.com/ - https://github.com/eProsima/FIWARE-DDS-Enabler/issues - https://github.com/eProsima/FIWARE-DDS-Enabler + https://github.com/eProsima/DDS-Enabler/issues + https://github.com/eProsima/DDS-Enabler cmake diff --git a/ddsenabler_participants/package.xml b/ddsenabler_participants/package.xml index efa12bf8..e474f5d9 100644 --- a/ddsenabler_participants/package.xml +++ b/ddsenabler_participants/package.xml @@ -12,8 +12,8 @@ Apache 2.0 https://www.eprosima.com/ - https://github.com/eProsima/FIWARE-DDS-Enabler/issues - https://github.com/eProsima/FIWARE-DDS-Enabler + https://github.com/eProsima/DDS-Enabler/issues + https://github.com/eProsima/DDS-Enabler cmake diff --git a/ddsenabler_test/package.xml b/ddsenabler_test/package.xml index 77656d65..2551ebb6 100644 --- a/ddsenabler_test/package.xml +++ b/ddsenabler_test/package.xml @@ -12,8 +12,8 @@ Apache 2.0 https://www.eprosima.com/ - https://github.com/eProsima/FIWARE-DDS-Enabler/issues - https://github.com/eProsima/FIWARE-DDS-Enabler + https://github.com/eProsima/DDS-Enabler/issues + https://github.com/eProsima/DDS-Enabler cmake diff --git a/ddsenabler_yaml/package.xml b/ddsenabler_yaml/package.xml index 4259fc50..61ce7d06 100644 --- a/ddsenabler_yaml/package.xml +++ b/ddsenabler_yaml/package.xml @@ -12,8 +12,8 @@ Apache 2.0 https://www.eprosima.com/ - https://github.com/eProsima/FIWARE-DDS-Enabler/issues - https://github.com/eProsima/FIWARE-DDS-Enabler + https://github.com/eProsima/DDS-Enabler/issues + https://github.com/eProsima/DDS-Enabler cmake