From f57f918b6ead6fc1c2ee065cfa0058bc4b335185 Mon Sep 17 00:00:00 2001 From: MarcosRigal Date: Tue, 7 Apr 2026 10:32:32 +0200 Subject: [PATCH] Restore Connext 7.7 and apply feedback --- linux_docker_resources/Dockerfile | 4 +- linux_docker_resources/entry_point.sh | 16 ++++-- .../rti_web_binaries_install_script.ps1 | 50 ++++++++++++------- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile index 9650b5f5..492b8526 100644 --- a/linux_docker_resources/Dockerfile +++ b/linux_docker_resources/Dockerfile @@ -161,7 +161,7 @@ RUN pip3 install -U git+https://github.com/ahcorde/lcov-to-cobertura-xml@master RUN if test \( ${PLATFORM} = x86 -a ${INSTALL_CONNEXT_DEBS} = true \); then \ if test \( ${ROS_DISTRO} = humble -o ${ROS_DISTRO} = jazzy \); then \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-6.0.1; \ - elif test ${ROS_DISTRO} = kilted -o 1; then \ + elif test ${ROS_DISTRO} = kilted; then \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-7.3.0-ros; \ else \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-7.7.0-ros; \ @@ -187,7 +187,7 @@ if test ${ROS_DISTRO} = jazzy -o ${ROS_DISTRO} = humble; then \ /tmp/rticonnextdds-src/rti_connext_dds-6.0.1.25-pro-target-x64Linux4gcc7.3.0.rtipkg; do \ cat $(echo ${splitpkg}.0?? | sort) > $splitpkg; \ done; \ -elif test ${ROS_DISTRO} = kilted -o 1; then \ +elif test ${ROS_DISTRO} = kilted; then \ for splitpkg in \ /tmp/rticonnextdds-src/rti_connext_dds-7.3.0-pro-host-x64Linux.run \ /tmp/rticonnextdds-src/rti_connext_dds-7.3.0-pro-target-x64Linux4gcc7.3.0.rtipkg; do \ diff --git a/linux_docker_resources/entry_point.sh b/linux_docker_resources/entry_point.sh index e6b83829..c9afaf2d 100755 --- a/linux_docker_resources/entry_point.sh +++ b/linux_docker_resources/entry_point.sh @@ -57,13 +57,21 @@ if [ "${ARCH}" = "x86_64" -a "${ID}" = "ubuntu" ]; then # - OpenSSL version: 1.1.1k # - Base architecture: x64Linux2.6gcc4.4.5 # - Target architecture: x64Linux4gcc7.3.0 - export CONNEXT_FULL_VERSION="7.3.0" + export CONNEXT_FULL_VERSION="7.7.0" export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" - export OPENSSL_FULL_VERSION="3.0.12" + export OPENSSL_FULL_VERSION="3.5.5" export OPENSSL_DISPLAY_VERSION="${OPENSSL_FULL_VERSION%.*}" - export CONNEXT_BASE_ARCH="x64Linux3gcc4.8.2" - export CONNEXT_TARGET_ARCH="x64Linux4gcc7.3.0" + export CONNEXT_BASE_ARCH="x64Linux4gcc8.5.0" + export CONNEXT_TARGET_ARCH="$CONNEXT_BASE_ARCH" case "${ROS_DISTRO}" in + lyrical) + export CONNEXT_FULL_VERSION="7.7.0" + export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" + export OPENSSL_FULL_VERSION="3.5.5" + export OPENSSL_DISPLAY_VERSION="${OPENSSL_FULL_VERSION%.*}" + export CONNEXT_BASE_ARCH="x64Linux4gcc8.5.0" + export CONNEXT_TARGET_ARCH="$CONNEXT_BASE_ARCH" + ;; kilted) export CONNEXT_FULL_VERSION="7.3.0" export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" diff --git a/windows_docker_resources/rti_web_binaries_install_script.ps1 b/windows_docker_resources/rti_web_binaries_install_script.ps1 index 7af2f7fd..de49068f 100644 --- a/windows_docker_resources/rti_web_binaries_install_script.ps1 +++ b/windows_docker_resources/rti_web_binaries_install_script.ps1 @@ -5,13 +5,29 @@ param( $ErrorActionPreference = "Stop" +function Invoke-CmdChecked { + param( + [Parameter(Mandatory = $true)] + [string]$Command, + + [Parameter(Mandatory = $true)] + [string]$Description + ) + + Write-Host $Description + cmd /c $Command + if ($LASTEXITCODE -ne 0) { + throw "$Description failed with exit code $LASTEXITCODE. Command: $Command" + } +} + Write-Host "Installing Connext for ROS distro: $RosDistro" $connextRoot = "C:\connext" $tempRoot = "C:\TEMP\rticonnextdds-src" $licenseFile = "C:\connext\rti_license.dat" -if ($true -or $RosDistro -eq "kilted") { +if ($RosDistro -eq "kilted") { $ConnextVersion = "7.3.0" $OpenSslVersion = "3.0.12" $ConnextDir = "C:\connext\rti_connext_dds-7.3.0" @@ -65,31 +81,27 @@ $hostInstallerBase = Join-Path $tempRoot $HostInstaller $targetInstallerBase = Join-Path $tempRoot $TargetInstaller Write-Host "Reassembling split installer files..." -cmd /c "copy /b ${hostInstallerBase}.??? ${hostInstallerBase}" -cmd /c "copy /b ${targetInstallerBase}.??? ${targetInstallerBase}" +Invoke-CmdChecked -Description "Reassembling split Connext host installer files..." -Command "copy /b ${hostInstallerBase}.??? ${hostInstallerBase}" +Invoke-CmdChecked -Description "Reassembling split Connext target installer files..." -Command "copy /b ${targetInstallerBase}.??? ${targetInstallerBase}" Write-Host "Installing Connext host package..." -Start-Process -FilePath $hostInstallerBase ` +$hostInstallerProcess = Start-Process -FilePath $hostInstallerBase ` -ArgumentList "--mode unattended --unattendedmodeui minimalWithDialogs --prefix $connextRoot" ` -Wait ` - -NoNewWindow - -$rtipkginstall = Join-Path $ConnextDir "bin\rtipkginstall.bat" + -NoNewWindow ` + -PassThru -Write-Host "Installing OpenSSL host package..." -cmd /c """$rtipkginstall"" -u ""$(Join-Path $tempRoot $OpenSslHostInstaller)""" - -Write-Host "Installing OpenSSL target package..." -cmd /c """$rtipkginstall"" -u ""$(Join-Path $tempRoot $OpenSslTargetInstaller)""" - -Write-Host "Installing Connext target package..." -cmd /c """$rtipkginstall"" -u ""$(Join-Path $tempRoot $TargetInstaller)""" +if ($hostInstallerProcess.ExitCode -ne 0) { + throw "Installing Connext host package failed with exit code $($hostInstallerProcess.ExitCode)." +} -Write-Host "Installing Security Plugins host package..." -cmd /c """$rtipkginstall"" -u ""$(Join-Path $tempRoot $SecurityHostInstaller)""" +$rtipkginstall = Join-Path $ConnextDir "bin\rtipkginstall.bat" -Write-Host "Installing Security Plugins target package..." -cmd /c """$rtipkginstall"" -u ""$(Join-Path $tempRoot $SecurityTargetInstaller)""" +Invoke-CmdChecked -Description "Installing OpenSSL host package..." -Command """$rtipkginstall"" -u ""$(Join-Path $tempRoot $OpenSslHostInstaller)""" +Invoke-CmdChecked -Description "Installing OpenSSL target package..." -Command """$rtipkginstall"" -u ""$(Join-Path $tempRoot $OpenSslTargetInstaller)""" +Invoke-CmdChecked -Description "Installing Connext target package..." -Command """$rtipkginstall"" -u ""$(Join-Path $tempRoot $TargetInstaller)""" +Invoke-CmdChecked -Description "Installing Security Plugins host package..." -Command """$rtipkginstall"" -u ""$(Join-Path $tempRoot $SecurityHostInstaller)""" +Invoke-CmdChecked -Description "Installing Security Plugins target package..." -Command """$rtipkginstall"" -u ""$(Join-Path $tempRoot $SecurityTargetInstaller)""" Write-Host "Connext installation completed successfully." Write-Host "CONNEXTDDS_DIR=$ConnextDir"