From 477c4f35190bf471e6e6c89e9a3389dae767a852 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Mon, 7 Oct 2024 11:56:36 +0200 Subject: [PATCH 1/2] Soft-link to ddsenabler header files --- docker/build-ubi/04.install-fastdds.sh | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh index 751b2ab09d..aaebdcae50 100755 --- a/docker/build-ubi/04.install-fastdds.sh +++ b/docker/build-ubi/04.install-fastdds.sh @@ -134,21 +134,4 @@ git checkout feature/typed_tests yum -y install lz4-devel libzstd-devel ./install_dds_module.sh - -# mkdir -p build/ddsenabler_participants -# cd build/ddsenabler_participants -# cmake ../../ddsenabler_participants -# cmake --build . --target install -# cd ../.. -# -# mkdir -p build/ddsenabler_yaml -# cd build/ddsenabler_yaml -# cmake ../../ddsenabler_yaml -# cmake --build . --target install -# cd ../.. -# -# mkdir -p build/ddsenabler -# cd build/ddsenabler -# cmake ../../ddsenabler -# cmake --build . --target install -# cd ../.. +ln -s /usr/local/include/ddsenabler /opt/Fast-DDS/FIWARE-DDS-Enabler/ddsenabler/include/ddsenabler From ce6068359f662c44d37c723c566d82d1e720c941 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Mon, 7 Oct 2024 12:49:08 +0200 Subject: [PATCH 2/2] Not using the ddsenabler install script as it has no error checks --- docker/build-ubi/04.install-fastdds.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh index aaebdcae50..3a09a26725 100755 --- a/docker/build-ubi/04.install-fastdds.sh +++ b/docker/build-ubi/04.install-fastdds.sh @@ -133,5 +133,21 @@ git fetch -a git checkout feature/typed_tests yum -y install lz4-devel libzstd-devel -./install_dds_module.sh -ln -s /usr/local/include/ddsenabler /opt/Fast-DDS/FIWARE-DDS-Enabler/ddsenabler/include/ddsenabler +# ./install_dds_module.sh + +mkdir -p build/ddsenabler_participants +cd build/ddsenabler_participants +cmake ../../ddsenabler_participants +cmake --build . --target install +cd ../.. + +mkdir -p build/ddsenabler_yaml +cd build/ddsenabler_yaml +cmake ../../ddsenabler_yaml +cmake --build . --target install +cd ../.. + +mkdir -p build/ddsenabler +cd build/ddsenabler +cmake ../../ddsenabler +cmake --build . --target install