From 777ba0ed1ff2ce4d085afa2f4301d53b9dbce212 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Fri, 4 Oct 2024 16:07:04 +0200 Subject: [PATCH 1/3] New branch for DDS Enabler --- docker/build-ubi/04.install-fastdds.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh index f74f97a99c..14aa4df055 100755 --- a/docker/build-ubi/04.install-fastdds.sh +++ b/docker/build-ubi/04.install-fastdds.sh @@ -129,7 +129,8 @@ cmake --build . --target install cd /opt/Fast-DDS git clone https://github.com/eProsima/FIWARE-DDS-Enabler.git cd FIWARE-DDS-Enabler - +git fetch -a +git co feature/typed_tests yum -y install lz4-devel libzstd-devel mkdir -p build/ddsenabler_participants From e66b99cb04e477edc609a791915b75c389079a97 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Fri, 4 Oct 2024 16:08:37 +0200 Subject: [PATCH 2/3] New branch for DDS Enabler --- docker/build-ubi/04.install-fastdds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh index 14aa4df055..2469f168be 100755 --- a/docker/build-ubi/04.install-fastdds.sh +++ b/docker/build-ubi/04.install-fastdds.sh @@ -130,7 +130,7 @@ cd /opt/Fast-DDS git clone https://github.com/eProsima/FIWARE-DDS-Enabler.git cd FIWARE-DDS-Enabler git fetch -a -git co feature/typed_tests +git checkout feature/typed_tests yum -y install lz4-devel libzstd-devel mkdir -p build/ddsenabler_participants From 525d38470e14b0abcbc09363ecf7cb195b723fc7 Mon Sep 17 00:00:00 2001 From: Ken Zangelin Date: Fri, 4 Oct 2024 16:34:28 +0200 Subject: [PATCH 3/3] Trying with the install script --- docker/build-ubi/04.install-fastdds.sh | 36 ++++++++++++++------------ 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/docker/build-ubi/04.install-fastdds.sh b/docker/build-ubi/04.install-fastdds.sh index 2469f168be..751b2ab09d 100755 --- a/docker/build-ubi/04.install-fastdds.sh +++ b/docker/build-ubi/04.install-fastdds.sh @@ -133,20 +133,22 @@ git fetch -a git checkout feature/typed_tests yum -y install lz4-devel libzstd-devel -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 ../.. +./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 ../..