From 89b19968ef288f8be273a6bc4169e747c5aad62d Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 23 Jun 2022 18:00:09 -0700 Subject: [PATCH 1/6] Migrate COLCON_PACKAGE=ignition Signed-off-by: methylDragon --- jenkins-scripts/ign_common-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_gui-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_launch-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_math-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_physics-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_tools-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_transport-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_utils-default-devel-windows-amd64.bat | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat index c6f6b31aa..d0e6e0a75 100644 --- a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat @@ -10,7 +10,7 @@ if %IGN_MAJOR_VERSION% GEQ 5 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) -set COLCON_PACKAGE=ignition-common +set COLCON_PACKAGE=gz-common set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat b/jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat index 0021cc5b7..36c81fee0 100644 --- a/jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat @@ -7,7 +7,7 @@ set IGN_CLEAN_WORKSPACE=true :: tinyxml2 from msgs set DEPEN_PKGS=libyaml libzip tinyxml2 openssl protobuf curl -set COLCON_PACKAGE=ignition-fuel_tools +set COLCON_PACKAGE=gz-fuel_tools set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" \ No newline at end of file diff --git a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat index 210551130..8f5ef58f6 100644 --- a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat @@ -11,7 +11,7 @@ if %IGN_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-gazebo +set COLCON_PACKAGE=gz-sim set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat index 3ab72a3bb..29fe8e692 100644 --- a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat @@ -12,7 +12,7 @@ if %IGN_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-gui +set COLCON_PACKAGE=gz-gui set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat index 823e281fb..398c6b1f4 100644 --- a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat @@ -9,7 +9,7 @@ for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORK if %IGN_MAJOR_VERSION% GEQ 6 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) -set COLCON_PACKAGE=ignition-launch +set COLCON_PACKAGE=gz-launch set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_math-default-devel-windows-amd64.bat b/jenkins-scripts/ign_math-default-devel-windows-amd64.bat index 91b5315c7..0c383bf0a 100644 --- a/jenkins-scripts/ign_math-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_math-default-devel-windows-amd64.bat @@ -3,7 +3,7 @@ set SCRIPT_DIR=%~dp0 set VCS_DIRECTORY=gz-math set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set COLCON_PACKAGE=ignition-math +set COLCON_PACKAGE=gz-math set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat b/jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat index 9fbdedce2..2c1387f75 100644 --- a/jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat @@ -5,7 +5,7 @@ set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS=protobuf tinyxml2 -set COLCON_PACKAGE=ignition-msgs +set COLCON_PACKAGE=gz-msgs set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat b/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat index c1e9ec62e..7005fefb3 100644 --- a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat @@ -10,7 +10,7 @@ if %IGN_MAJOR_VERSION% GEQ 6 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-physics +set COLCON_PACKAGE=gz-physics set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%/lib/colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat b/jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat index f90eac5c2..cb06bbcd9 100644 --- a/jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat @@ -6,7 +6,7 @@ set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS="dlfcn-win32" -set COLCON_PACKAGE=ignition-plugin +set COLCON_PACKAGE=gz-plugin set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%/lib/colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat b/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat index bcf0a19aa..4cb028772 100644 --- a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat @@ -15,7 +15,7 @@ if %IGN_MAJOR_VERSION% GEQ 7 ( ) :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-rendering +set COLCON_PACKAGE=gz-rendering set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat b/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat index a4b5bede6..8b69507e0 100644 --- a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat @@ -11,7 +11,7 @@ if %IGN_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-sensors +set COLCON_PACKAGE=gz-sensors set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat b/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat index d9b607aeb..b6a7ce39e 100644 --- a/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat @@ -4,7 +4,7 @@ set VCS_DIRECTORY=gz-tools set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set COLCON_PACKAGE=ignition-tools +set COLCON_PACKAGE=gz-tools :: override logic @ colcon-default-devel-windows.bat to handle ign-tools1 case on windows setlocal ENABLEDELAYEDEXPANSION diff --git a/jenkins-scripts/ign_transport-default-devel-windows-amd64.bat b/jenkins-scripts/ign_transport-default-devel-windows-amd64.bat index a1cc75ed6..1f2142f30 100644 --- a/jenkins-scripts/ign_transport-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_transport-default-devel-windows-amd64.bat @@ -7,7 +7,7 @@ set PLATFORM_TO_BUILD=amd64 set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS=cppzmq dlfcn-win32 protobuf sqlite3 tinyxml2 zeromq -set COLCON_PACKAGE=ignition-transport +set COLCON_PACKAGE=gz-transport set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" diff --git a/jenkins-scripts/ign_utils-default-devel-windows-amd64.bat b/jenkins-scripts/ign_utils-default-devel-windows-amd64.bat index 6a7acb02e..8da64ffcb 100644 --- a/jenkins-scripts/ign_utils-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_utils-default-devel-windows-amd64.bat @@ -9,7 +9,7 @@ set IGN_CLEAN_WORKSPACE=true :: set DEPEN_PKGS= :: This needs to be migrated to DSL to get multi-major versions correctly -set COLCON_PACKAGE=ignition-utils +set COLCON_PACKAGE=gz-utils set COLCON_AUTO_MAJOR_VERSION=true call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat" From be6773c04a8f13455151d55ee1e93d992537a2b3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 23 Jun 2022 17:58:19 -0700 Subject: [PATCH 2/6] Migrate some (hopefully private/localized) bash variables Signed-off-by: methylDragon --- .../docker/ign_cmake-compilation.bash | 12 +- .../docker/ign_common-compilation.bash | 16 +-- .../docker/ign_fuel-tools-compilation.bash | 14 +- .../docker/ign_gazebo-compilation.bash | 12 +- .../docker/ign_gui-compilation.bash | 16 +-- .../docker/ign_launch-compilation.bash | 14 +- .../docker/ign_launch-install-test-job.bash | 2 +- .../docker/ign_math-compilation.bash | 16 +-- .../docker/ign_msgs-compilation.bash | 16 +-- .../docker/ign_physics-compilation.bash | 14 +- .../docker/ign_plugin-compilation.bash | 16 +-- .../docker/ign_rendering-compilation.bash | 16 +-- .../docker/ign_rndf-compilation.bash | 2 +- .../docker/ign_sensors-compilation.bash | 14 +- .../docker/ign_transport-compilation.bash | 16 +-- .../docker/ign_utils-compilation.bash | 14 +- .../docker/ignition-abichecker.bash | 40 +++--- jenkins-scripts/docker/lib/_gazebo_utils.sh | 2 +- .../docker/lib/gazebo-base-default.bash | 10 +- .../docker/lib/generic-building-base.bash | 28 ++-- jenkins-scripts/dsl/sdformat.dsl | 2 +- ...ign_common-default-devel-windows-amd64.bat | 6 +- ...ign_gazebo-default-devel-windows-amd64.bat | 6 +- .../ign_gui-default-devel-windows-amd64.bat | 4 +- ...ign_launch-default-devel-windows-amd64.bat | 6 +- ...gn_physics-default-devel-windows-amd64.bat | 4 +- ..._rendering-default-devel-windows-amd64.bat | 6 +- ...gn_sensors-default-devel-windows-amd64.bat | 4 +- jenkins-scripts/lib/dependencies_archive.sh | 134 +++++++++--------- jenkins-scripts/lib/sdformat-base-windows.bat | 8 +- 30 files changed, 235 insertions(+), 235 deletions(-) diff --git a/jenkins-scripts/docker/ign_cmake-compilation.bash b/jenkins-scripts/docker/ign_cmake-compilation.bash index 732e98c52..b956bfd5b 100644 --- a/jenkins-scripts/docker/ign_cmake-compilation.bash +++ b/jenkins-scripts/docker/ign_cmake-compilation.bash @@ -20,17 +20,17 @@ export BUILDING_DEPENDENCIES="pkg-config" # Enable long-running ign-cmake tests in CI. export BUILDING_EXTRA_CMAKE_PARAMS+=" -DBUILDSYSTEM_TESTING=True" -# Identify IGN_CMAKE_MAJOR_VERSION to help with dependency resolution -IGN_CMAKE_MAJOR_VERSION=$(\ +# Identify GZ_CMAKE_MAJOR_VERSION to help with dependency resolution +GZ_CMAKE_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-cmake/CMakeLists.txt) -# Check IGN_CMAKE version is integer -if ! [[ ${IGN_CMAKE_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_CMAKE_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_CMAKE version is integer +if ! [[ ${GZ_CMAKE_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_CMAKE_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -export GZDEV_PROJECT_NAME="gz-cmake${IGN_CMAKE_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-cmake${GZ_CMAKE_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_common-compilation.bash b/jenkins-scripts/docker/ign_common-compilation.bash index c70ddb0d8..2f1ecd1f0 100644 --- a/jenkins-scripts/docker/ign_common-compilation.bash +++ b/jenkins-scripts/docker/ign_common-compilation.bash @@ -15,23 +15,23 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-common" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_COMMON_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_COMMON_DEPENDENCIES" -# Identify IGN_COMMON_MAJOR_VERSION to help with dependency resolution -IGN_COMMON_MAJOR_VERSION=$(\ +# Identify GZ_COMMON_MAJOR_VERSION to help with dependency resolution +GZ_COMMON_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-common/CMakeLists.txt) -# Check IGN_COMMON version is integer -if ! [[ ${IGN_COMMON_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_COMMON_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_COMMON version is integer +if ! [[ ${GZ_COMMON_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_COMMON_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_COMMON_MAJOR_VERSION} -ge 3 ]]; then +if [[ ${GZ_COMMON_MAJOR_VERSION} -ge 3 ]]; then export NEED_C17_COMPILER=true fi -export GZDEV_PROJECT_NAME="gz-common${IGN_COMMON_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-common${GZ_COMMON_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_fuel-tools-compilation.bash b/jenkins-scripts/docker/ign_fuel-tools-compilation.bash index aafe604d0..7bed0ae12 100644 --- a/jenkins-scripts/docker/ign_fuel-tools-compilation.bash +++ b/jenkins-scripts/docker/ign_fuel-tools-compilation.bash @@ -15,20 +15,20 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-fuel-tools" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_FUEL_TOOLS_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_FUEL_TOOLS_DEPENDENCIES" export BUILDING_JOB_REPOSITORIES="stable" -# Identify IGN_FUEL_TOOLS_MAJOR_VERSION to help with dependency resolution -IGN_FUEL_TOOLS_MAJOR_VERSION=$(\ +# Identify GZ_FUEL_TOOLS_MAJOR_VERSION to help with dependency resolution +GZ_FUEL_TOOLS_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-fuel-tools/CMakeLists.txt) -# Check IGN_FUEL_TOOLS version is integer -if ! [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_FUEL_TOOLS_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_FUEL_TOOLS version is integer +if ! [[ ${GZ_FUEL_TOOLS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_FUEL_TOOLS_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -export GZDEV_PROJECT_NAME="gz-fuel-tools${IGN_FUEL_TOOLS_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-fuel-tools${GZ_FUEL_TOOLS_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_gazebo-compilation.bash b/jenkins-scripts/docker/ign_gazebo-compilation.bash index b7f81a6ae..86caabcbc 100644 --- a/jenkins-scripts/docker/ign_gazebo-compilation.bash +++ b/jenkins-scripts/docker/ign_gazebo-compilation.bash @@ -15,22 +15,22 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-gazebo" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_GAZEBO_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_SIM_DEPENDENCIES" -# Identify IGN_GAZEBO_MAJOR_VERSION to help with dependency resolution -IGN_GAZEBO_MAJOR_VERSION=$(\ +# Identify GZ_SIM_MAJOR_VERSION to help with dependency resolution +GZ_SIM_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-gazebo/CMakeLists.txt) # Check IGN_GAZEBO version is integer -if ! [[ ${IGN_GAZEBO_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_GAZEBO_MAJOR_VERSION is not an integer, check the detection" +if ! [[ ${GZ_SIM_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_SIM_MAJOR_VERSION is not an integer, check the detection" exit -1 fi export NEED_C17_COMPILER=true export GPU_SUPPORT_NEEDED=true -export GZDEV_PROJECT_NAME="gz-sim${IGN_GAZEBO_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-sim${GZ_SIM_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_gui-compilation.bash b/jenkins-scripts/docker/ign_gui-compilation.bash index 9081132ba..4c00c02d2 100644 --- a/jenkins-scripts/docker/ign_gui-compilation.bash +++ b/jenkins-scripts/docker/ign_gui-compilation.bash @@ -15,24 +15,24 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-gui" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_GUI_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_GUI_DEPENDENCIES" -# Identify IGN_GUI_MAJOR_VERSION to help with dependency resolution -IGN_GUI_MAJOR_VERSION=$(\ +# Identify GZ_GUI_MAJOR_VERSION to help with dependency resolution +GZ_GUI_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-gui/CMakeLists.txt) -# Check IGN_GUI_MAJOR_VERSION version is integer -if ! [[ ${IGN_GUI_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_GUI_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_GUI_MAJOR_VERSION version is integer +if ! [[ ${GZ_GUI_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_GUI_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_GUI_MAJOR_VERSION} -ge 1 ]]; then +if [[ ${GZ_GUI_MAJOR_VERSION} -ge 1 ]]; then export NEED_C17_COMPILER=true fi export GPU_SUPPORT_NEEDED=true -export GZDEV_PROJECT_NAME="gz-gui${IGN_GUI_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-gui${GZ_GUI_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_launch-compilation.bash b/jenkins-scripts/docker/ign_launch-compilation.bash index 691b21cee..7e5923e1c 100644 --- a/jenkins-scripts/docker/ign_launch-compilation.bash +++ b/jenkins-scripts/docker/ign_launch-compilation.bash @@ -15,20 +15,20 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-launch" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_LAUNCH_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_LAUNCH_DEPENDENCIES" -# Identify IGN_LAUNCH_MAJOR_VERSION to help with dependency resolution -IGN_LAUNCH_MAJOR_VERSION=$(\ +# Identify GZ_LAUNCH_MAJOR_VERSION to help with dependency resolution +GZ_LAUNCH_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-launch/CMakeLists.txt) -# Check IGN_LAUNCH version is integer -if ! [[ ${IGN_LAUNCH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_LAUNCH_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_LAUNCH version is integer +if ! [[ ${GZ_LAUNCH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_LAUNCH_MAJOR_VERSION is not an integer, check the detection" exit -1 fi export NEED_C17_COMPILER=true -export GZDEV_PROJECT_NAME="gz-launch${IGN_LAUNCH_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-launch${GZ_LAUNCH_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_launch-install-test-job.bash b/jenkins-scripts/docker/ign_launch-install-test-job.bash index f41da954b..6b91dbe00 100644 --- a/jenkins-scripts/docker/ign_launch-install-test-job.bash +++ b/jenkins-scripts/docker/ign_launch-install-test-job.bash @@ -10,7 +10,7 @@ export GPU_SUPPORT_NEEDED=true . ${SCRIPT_DIR}/lib/_gazebo_utils.sh INSTALL_JOB_POSTINSTALL_HOOK=""" -${IGN_GAZEBO_RUNTIME_TEST} +${GZ_SIM_RUNTIME_TEST} """ # Need bc to proper testing and parsing the time export DEPENDENCY_PKGS="${DEPENDENCY_PKGS} wget bc" diff --git a/jenkins-scripts/docker/ign_math-compilation.bash b/jenkins-scripts/docker/ign_math-compilation.bash index 528e9fae3..f18a769f3 100644 --- a/jenkins-scripts/docker/ign_math-compilation.bash +++ b/jenkins-scripts/docker/ign_math-compilation.bash @@ -16,23 +16,23 @@ fi export BUILDING_SOFTWARE_DIRECTORY="ign-math" export BUILDING_JOB_REPOSITORIES="stable" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_MATH_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_MATH_DEPENDENCIES" -# Identify IGN_MATH_MAJOR_VERSION to help with dependency resolution -IGN_MATH_MAJOR_VERSION=$(\ +# Identify GZ_MATH_MAJOR_VERSION to help with dependency resolution +GZ_MATH_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-math/CMakeLists.txt) -# Check IGN_MATH version is integer -if ! [[ ${IGN_MATH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_MATH_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_MATH version is integer +if ! [[ ${GZ_MATH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_MATH_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_MATH_MAJOR_VERSION} -ge 6 ]]; then +if [[ ${GZ_MATH_MAJOR_VERSION} -ge 6 ]]; then export NEED_C17_COMPILER=true fi -export GZDEV_PROJECT_NAME="gz-math${IGN_MATH_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-math${GZ_MATH_MAJOR_VERSION}" . "${SCRIPT_DIR}/lib/generic-building-base.bash" diff --git a/jenkins-scripts/docker/ign_msgs-compilation.bash b/jenkins-scripts/docker/ign_msgs-compilation.bash index ab10e9e7b..8dbcd48e0 100644 --- a/jenkins-scripts/docker/ign_msgs-compilation.bash +++ b/jenkins-scripts/docker/ign_msgs-compilation.bash @@ -15,23 +15,23 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-msgs" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_MSGS_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_MSGS_DEPENDENCIES" -# Identify IGN_MSGS_MAJOR_VERSION to help with dependency resolution -IGN_MSGS_MAJOR_VERSION=$(\ +# Identify GZ_MSGS_MAJOR_VERSION to help with dependency resolution +GZ_MSGS_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-msgs/CMakeLists.txt) -# Check IGN_MSGS version is integer -if ! [[ ${IGN_MSGS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_MSGS_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_MSGS version is integer +if ! [[ ${GZ_MSGS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_MSGS_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_MSGS_MAJOR_VERSION} -ge 3 ]]; then +if [[ ${GZ_MSGS_MAJOR_VERSION} -ge 3 ]]; then export NEED_C17_COMPILER=true fi -export GZDEV_PROJECT_NAME="gz-msgs${IGN_MSGS_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-msgs${GZ_MSGS_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_physics-compilation.bash b/jenkins-scripts/docker/ign_physics-compilation.bash index 257e21548..d57594a5c 100644 --- a/jenkins-scripts/docker/ign_physics-compilation.bash +++ b/jenkins-scripts/docker/ign_physics-compilation.bash @@ -15,20 +15,20 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-physics" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_PHYSICS_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_PHYSICS_DEPENDENCIES" -# Identify IGN_PHYSICS_MAJOR_VERSION to help with dependency resolution -IGN_PHYSICS_MAJOR_VERSION=$(\ +# Identify GZ_PHYSICS_MAJOR_VERSION to help with dependency resolution +GZ_PHYSICS_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-physics/CMakeLists.txt) -# Check IGN_PHYSICS version is integer -if ! [[ ${IGN_PHYSICS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_PHYSICS_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_PHYSICS version is integer +if ! [[ ${GZ_PHYSICS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_PHYSICS_MAJOR_VERSION is not an integer, check the detection" exit -1 fi export NEED_C17_COMPILER=true -export GZDEV_PROJECT_NAME="gz-physics${IGN_PHYSICS_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-physics${GZ_PHYSICS_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_plugin-compilation.bash b/jenkins-scripts/docker/ign_plugin-compilation.bash index 5c722e1a7..f6362e131 100644 --- a/jenkins-scripts/docker/ign_plugin-compilation.bash +++ b/jenkins-scripts/docker/ign_plugin-compilation.bash @@ -15,23 +15,23 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-plugin" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_PLUGIN_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_PLUGIN_DEPENDENCIES" -# Identify IGN_PLUGIN_MAJOR_VERSION to help with dependency resolution -IGN_PLUGIN_MAJOR_VERSION=$(\ +# Identify GZ_PLUGIN_MAJOR_VERSION to help with dependency resolution +GZ_PLUGIN_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-plugin/CMakeLists.txt) -# Check IGN_PLUGIN version is integer -if ! [[ ${IGN_PLUGIN_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_PLUGIN_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_PLUGIN version is integer +if ! [[ ${GZ_PLUGIN_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_PLUGIN_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_PLUGIN_MAJOR_VERSION} -ge 6 ]]; then +if [[ ${GZ_PLUGIN_MAJOR_VERSION} -ge 6 ]]; then export NEED_C17_COMPILER=true fi -export GZDEV_PROJECT_NAME="gz-plugin${IGN_PLUGIN_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-plugin${GZ_PLUGIN_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_rendering-compilation.bash b/jenkins-scripts/docker/ign_rendering-compilation.bash index bf5cde07f..a350093b2 100644 --- a/jenkins-scripts/docker/ign_rendering-compilation.bash +++ b/jenkins-scripts/docker/ign_rendering-compilation.bash @@ -15,25 +15,25 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-rendering" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_RENDERING_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_RENDERING_DEPENDENCIES" -# Identify IGN_RENDERING_MAJOR_VERSION to help with dependency resolution -IGN_RENDERING_MAJOR_VERSION=$(\ +# Identify GZ_RENDERING_MAJOR_VERSION to help with dependency resolution +GZ_RENDERING_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-rendering/CMakeLists.txt) -# Check IGN_RENDERING version is integer -if ! [[ ${IGN_RENDERING_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_RENDERING_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_RENDERING version is integer +if ! [[ ${GZ_RENDERING_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_RENDERING_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_RENDERING_MAJOR_VERSION} -ge 1 ]]; then +if [[ ${GZ_RENDERING_MAJOR_VERSION} -ge 1 ]]; then export NEED_C17_COMPILER=true fi export GPU_SUPPORT_NEEDED=true -export GZDEV_PROJECT_NAME="gz-rendering${IGN_RENDERING_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-rendering${GZ_RENDERING_MAJOR_VERSION}" export BUILDING_EXTRA_CMAKE_PARAMS+=" -DSKIP_optix=true" diff --git a/jenkins-scripts/docker/ign_rndf-compilation.bash b/jenkins-scripts/docker/ign_rndf-compilation.bash index af087b81b..6799fc31d 100644 --- a/jenkins-scripts/docker/ign_rndf-compilation.bash +++ b/jenkins-scripts/docker/ign_rndf-compilation.bash @@ -15,7 +15,7 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-rndf" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_RNDF_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_RNDF_DEPENDENCIES" export BUILDING_JOB_REPOSITORIES="stable" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_sensors-compilation.bash b/jenkins-scripts/docker/ign_sensors-compilation.bash index 14623fd11..16c740653 100644 --- a/jenkins-scripts/docker/ign_sensors-compilation.bash +++ b/jenkins-scripts/docker/ign_sensors-compilation.bash @@ -15,22 +15,22 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-sensors" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_SENSORS_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_SENSORS_DEPENDENCIES" -# Identify IGN_SENSORS_MAJOR_VERSION to help with dependency resolution -IGN_SENSORS_MAJOR_VERSION=$(\ +# Identify GZ_SENSORS_MAJOR_VERSION to help with dependency resolution +GZ_SENSORS_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-sensors/CMakeLists.txt) -# Check IGN_SENSORS version is integer -if ! [[ ${IGN_SENSORS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_SENSORS_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_SENSORS version is integer +if ! [[ ${GZ_SENSORS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_SENSORS_MAJOR_VERSION is not an integer, check the detection" exit -1 fi export NEED_C17_COMPILER=true export GPU_SUPPORT_NEEDED=true -export GZDEV_PROJECT_NAME="gz-sensors${IGN_SENSORS_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-sensors${GZ_SENSORS_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ign_transport-compilation.bash b/jenkins-scripts/docker/ign_transport-compilation.bash index c7e393f1d..c6152eea9 100644 --- a/jenkins-scripts/docker/ign_transport-compilation.bash +++ b/jenkins-scripts/docker/ign_transport-compilation.bash @@ -15,23 +15,23 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-transport" - export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_TRANSPORT_DEPENDENCIES" + export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_TRANSPORT_DEPENDENCIES" -# Identify IGN_TRANSPORT_MAJOR_VERSION to help with dependency resolution -IGN_TRANSPORT_MAJOR_VERSION=$(\ +# Identify GZ_TRANSPORT_MAJOR_VERSION to help with dependency resolution +GZ_TRANSPORT_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-transport/CMakeLists.txt) -# Check IGN_TRANSPORT version is integer -if ! [[ ${IGN_TRANSPORT_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_TRANSPORT_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_TRANSPORT version is integer +if ! [[ ${GZ_TRANSPORT_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_TRANSPORT_MAJOR_VERSION is not an integer, check the detection" exit -1 fi -if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -ge 6 ]]; then +if [[ ${GZ_TRANSPORT_MAJOR_VERSION} -ge 6 ]]; then export NEED_C17_COMPILER=true fi -export GZDEV_PROJECT_NAME="gz-transport${IGN_TRANSPORT_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-transport${GZ_TRANSPORT_MAJOR_VERSION}" . "${SCRIPT_DIR}/lib/generic-building-base.bash" diff --git a/jenkins-scripts/docker/ign_utils-compilation.bash b/jenkins-scripts/docker/ign_utils-compilation.bash index b35263a63..a30db9f35 100644 --- a/jenkins-scripts/docker/ign_utils-compilation.bash +++ b/jenkins-scripts/docker/ign_utils-compilation.bash @@ -15,21 +15,21 @@ if [[ -z ${DISTRO} ]]; then fi export BUILDING_SOFTWARE_DIRECTORY="ign-utils" -export BUILDING_PKG_DEPENDENCIES_VAR_NAME="IGN_UTILS_DEPENDENCIES" +export BUILDING_PKG_DEPENDENCIES_VAR_NAME="GZ_UTILS_DEPENDENCIES" -# Identify IGN_UTILS_MAJOR_VERSION to help with dependency resolution -IGN_UTILS_MAJOR_VERSION=$(\ +# Identify GZ_UTILS_MAJOR_VERSION to help with dependency resolution +GZ_UTILS_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/ign-utils/CMakeLists.txt) -# Check IGN_UTILS version is integer -if ! [[ ${IGN_UTILS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then - echo "Error! IGN_UTILS_MAJOR_VERSION is not an integer, check the detection" +# Check GZ_UTILS version is integer +if ! [[ ${GZ_UTILS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then + echo "Error! GZ_UTILS_MAJOR_VERSION is not an integer, check the detection" exit -1 fi export NEED_C17_COMPILER=true -export GZDEV_PROJECT_NAME="gz-utils${IGN_UTILS_MAJOR_VERSION}" +export GZDEV_PROJECT_NAME="gz-utils${GZ_UTILS_MAJOR_VERSION}" . ${SCRIPT_DIR}/lib/generic-building-base.bash diff --git a/jenkins-scripts/docker/ignition-abichecker.bash b/jenkins-scripts/docker/ignition-abichecker.bash index bc9dc7dcd..2dd18646a 100644 --- a/jenkins-scripts/docker/ignition-abichecker.bash +++ b/jenkins-scripts/docker/ignition-abichecker.bash @@ -20,39 +20,39 @@ if [[ -z ${ABI_JOB_SOFTWARE_NAME} ]]; then exit 1 fi -# convert from ign-package to IGN_PACKAGE_DEPENDENCIES -IGN_NAME_PREFIX=$(\ +# convert from ign-package to GZ_PACKAGE_DEPENDENCIES +GZ_NAME_PREFIX=$(\ echo ${ABI_JOB_SOFTWARE_NAME} | tr '[:lower:]-' '[:upper:]_') -ABI_JOB_PKG_DEPENDENCIES_VAR_NAME=${IGN_NAME_PREFIX}_DEPENDENCIES -DART_FROM_PKGS_VAR_NAME=${IGN_NAME_PREFIX}_DART_FROM_PKGS +ABI_JOB_PKG_DEPENDENCIES_VAR_NAME=${GZ_NAME_PREFIX}_DEPENDENCIES +DART_FROM_PKGS_VAR_NAME=${GZ_NAME_PREFIX}_DART_FROM_PKGS -# Identify IGN_MSGS_MAJOR_VERSION to help with dependency resolution -export IGN_NAME_PREFIX_MAJOR_VERSION=$(\ +# Identify GZ_MSGS_MAJOR_VERSION to help with dependency resolution +export GZ_NAME_PREFIX_MAJOR_VERSION=$(\ python3 ${SCRIPT_DIR}/../tools/detect_cmake_major_version.py \ ${WORKSPACE}/${ABI_JOB_SOFTWARE_NAME}/CMakeLists.txt) -export ${IGN_NAME_PREFIX}_MAJOR_VERSION=${IGN_NAME_PREFIX_MAJOR_VERSION} +export ${GZ_NAME_PREFIX}_MAJOR_VERSION=${GZ_NAME_PREFIX_MAJOR_VERSION} # check if NEED_C17_COMPILER should be set if [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gazebo" ]] || \ [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-physics" ]] || \ [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-sensors" ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-common" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 3 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gui" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-math" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-msgs" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 3 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-plugin" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-rendering" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-transport" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-common" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 3 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gui" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-math" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-msgs" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 3 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-plugin" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-rendering" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 1 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-transport" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] then export NEED_C17_COMPILER=true fi # check if OGRE-2.2 include paths are needed -if [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gazebo" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gui" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-launch" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 5 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-sensors" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ - [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-rendering" && ${IGN_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] +if [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gazebo" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gui" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-launch" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 5 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-sensors" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \ + [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-rendering" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] then export EXTRA_INCLUDES=""" @@ -65,6 +65,6 @@ fi export ABI_JOB_REPOS="stable" # set GZDEV_PROJECT_NAME so it can override repos if necessary -export GZDEV_PROJECT_NAME=${ABI_JOB_SOFTWARE_NAME/ign-/ignition-}${IGN_NAME_PREFIX_MAJOR_VERSION} +export GZDEV_PROJECT_NAME=${ABI_JOB_SOFTWARE_NAME/ign-/ignition-}${GZ_NAME_PREFIX_MAJOR_VERSION} . ${SCRIPT_DIR}/lib/generic-abi-base.bash diff --git a/jenkins-scripts/docker/lib/_gazebo_utils.sh b/jenkins-scripts/docker/lib/_gazebo_utils.sh index 1f5059c26..9c3a39468 100644 --- a/jenkins-scripts/docker/lib/_gazebo_utils.sh +++ b/jenkins-scripts/docker/lib/_gazebo_utils.sh @@ -23,7 +23,7 @@ mkdir -p ~/.gazebo/models tar -xf /tmp/master.tar.gz -C ~/.gazebo/models --strip 1 >/dev/null 2>&1 rm /tmp/master.tar.gz""" -IGN_GAZEBO_RUNTIME_TEST=""" +GZ_SIM_RUNTIME_TEST=""" echo '# BEGIN SECTION: test the script' TEST_START=\`date +%s\` timeout --preserve-status 180 ign gazebo -v -r camera_sensor.sdf || true diff --git a/jenkins-scripts/docker/lib/gazebo-base-default.bash b/jenkins-scripts/docker/lib/gazebo-base-default.bash index afbfd8b28..4bce4453d 100644 --- a/jenkins-scripts/docker/lib/gazebo-base-default.bash +++ b/jenkins-scripts/docker/lib/gazebo-base-default.bash @@ -244,27 +244,27 @@ DEPENDENCY_PKGS="${BASE_DEPENDENCIES} \ [[ -z ${GAZEBO_BUILD_IGN_MATH} ]] && GAZEBO_BUILD_IGN_MATH=false if $GAZEBO_BUILD_IGN_MATH; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_MATH_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MATH_DEPENDENCIES}" fi [[ -z ${GAZEBO_BUILD_IGN_MSGS} ]] && GAZEBO_BUILD_IGN_MSGS=false if $GAZEBO_BUILD_IGN_MSGS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_MSGS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MSGS_DEPENDENCIES}" fi [[ -z ${GAZEBO_BUILD_IGN_TRANSPORT} ]] && GAZEBO_BUILD_IGN_TRANSPORT=false if $GAZEBO_BUILD_IGN_TRANSPORT; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_TRANSPORT_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TRANSPORT_DEPENDENCIES}" fi [[ -z ${GAZEBO_BUILD_IGN_GUI} ]] && GAZEBO_BUILD_IGN_GUI=false if $GAZEBO_BUILD_IGN_GUI; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_GUI_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_GUI_DEPENDENCIES}" fi [[ -z ${GAZEBO_BUILD_IGN_COMMON} ]] && GAZEBO_BUILD_IGN_COMMON=false if $GAZEBO_BUILD_IGN_COMMON; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_COMMON_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_COMMON_DEPENDENCIES}" fi [[ -z ${GAZEBO_BUILD_SDFORMAT} ]] && GAZEBO_BUILD_SDFORMAT=false diff --git a/jenkins-scripts/docker/lib/generic-building-base.bash b/jenkins-scripts/docker/lib/generic-building-base.bash index a2fb1b946..1b79f1a27 100644 --- a/jenkins-scripts/docker/lib/generic-building-base.bash +++ b/jenkins-scripts/docker/lib/generic-building-base.bash @@ -14,57 +14,57 @@ DEPENDENCY_PKGS="${BASE_DEPENDENCIES} ${ARCHIVE_PROJECT_DEPENDECIES} ${BUILDING_ [[ -z ${BUILD_IGN_MATH} ]] && BUILD_IGN_MATH=false if $BUILD_IGN_MATH; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_MATH_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MATH_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_MSGS} ]] && BUILD_IGN_MSGS=false if $BUILD_IGN_MSGS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_MSGS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MSGS_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_TRANSPORT} ]] && BUILD_IGN_TRANSPORT=false if $BUILD_IGN_TRANSPORT; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_TRANSPORT_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TRANSPORT_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_GAZEBO} ]] && BUILD_IGN_GAZEBO=false -if $BUILD_IGN_GAZEBO; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_GAZEBO_DEPENDENCIES}" +[[ -z ${BUILD_GZ_SIM} ]] && BUILD_GZ_SIM=false +if $BUILD_GZ_SIM; then + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_SIM_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_GUI} ]] && BUILD_IGN_GUI=false if $BUILD_IGN_GUI; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_GUI_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_GUI_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_COMMON} ]] && BUILD_IGN_COMMON=false if $BUILD_IGN_COMMON; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_COMMON_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_COMMON_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_FUEL_TOOLS} ]] && BUILD_IGN_FUEL_TOOLS=false if $BUILD_IGN_FUEL_TOOLS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_FUEL_TOOLS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_FUEL_TOOLS_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_SENSORS} ]] && BUILD_IGN_SENSORS=false if $BUILD_IGN_SENSORS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_SENSORS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_SENSORS_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_PHYSICS} ]] && BUILD_IGN_PHYSICS=false if $BUILD_IGN_PHYSICS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_PHYSICS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_PHYSICS_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_RENDERING} ]] && BUILD_IGN_RENDERING=false if $BUILD_IGN_RENDERING; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_RENDERING_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_RENDERING_DEPENDENCIES}" fi [[ -z ${BUILD_IGN_TOOLS} ]] && BUILD_IGN_TOOLS=false if $BUILD_IGN_TOOLS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_TOOLS_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TOOLS_DEPENDENCIES}" fi [[ -z ${BUILD_SDFORMAT} ]] && BUILD_SDFORMAT=false @@ -74,7 +74,7 @@ fi [[ -z ${BUILD_IGN_UTILS} ]] && BUILD_IGN_UTILS=false if $BUILD_IGN_UTILS; then - DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${IGN_UTILS_BASE_DEPENDENCIES}" + DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_UTILS_BASE_DEPENDENCIES}" fi SOFTWARE_DIR="${BUILDING_SOFTWARE_DIRECTORY}" diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index de9e37c15..095f1ed78 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -381,7 +381,7 @@ all_branches.each { branch -> steps { batchFile("""\ - set USE_IGNITION_ZIP=FALSE + set USE_GZ_ZIP=FALSE call "./scripts/jenkins-scripts/sdformat-default-devel-windows-amd64.bat" """.stripIndent()) } diff --git a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat index d0e6e0a75..05f9a219f 100644 --- a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat @@ -4,9 +4,9 @@ set VCS_DIRECTORY=gz-common set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set DEPEN_PKGS=assimp ffmpeg freeimage gts tinyxml2 -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 5 ( +set DEPEN_PKGS=ffmpeg freeimage gts tinyxml2 +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 5 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) diff --git a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat index 8f5ef58f6..5eabe7693 100644 --- a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat @@ -5,9 +5,9 @@ set VCS_DIRECTORY=gz-sim set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true :: dlfcn -set DEPEN_PKGS=assimp boost-core ccd cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf qt5 qwt tinyxml2 zeromq -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 7 ( +set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly diff --git a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat index 29fe8e692..31707055f 100644 --- a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat @@ -7,8 +7,8 @@ set IGN_CLEAN_WORKSPACE=true :: ogre2 from vcpkg-ports set DEPEN_PKGS=qt5 qt5-winextras qwt protobuf tinyxml2 freeimage ogre ogre22 -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 7 ( +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly diff --git a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat index 398c6b1f4..36dfeadf8 100644 --- a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat @@ -4,9 +4,9 @@ set VCS_DIRECTORY=gz-launch set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set DEPEN_PKGS=assimp boost-core ccd cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf qt5 qwt tinyxml2 zeromq -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 6 ( +set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 6 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) set COLCON_PACKAGE=gz-launch diff --git a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat b/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat index 7005fefb3..529d41c83 100644 --- a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat @@ -5,8 +5,8 @@ set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS=eigen3 tinyxml2 -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 6 ( +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 6 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly diff --git a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat b/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat index 4cb028772..c180f5118 100644 --- a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat @@ -6,11 +6,11 @@ set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS=boost-core cuda dlfcn-win32 eigen3 freeimage glib gts ogre ogre2 -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 5 ( +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 5 ( set DEPEN_PKGS=%DEPEN_PKGS% ogre22 ) -if %IGN_MAJOR_VERSION% GEQ 7 ( +if %GZ_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) diff --git a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat b/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat index 8b69507e0..206b5ee4e 100644 --- a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat @@ -6,8 +6,8 @@ set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set DEPEN_PKGS=protobuf tinyxml2 -for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i -if %IGN_MAJOR_VERSION% GEQ 7 ( +for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i +if %GZ_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal ) :: This needs to be migrated to DSL to get multi-major versions correctly diff --git a/jenkins-scripts/lib/dependencies_archive.sh b/jenkins-scripts/lib/dependencies_archive.sh index 6d0531ec9..0d0e25065 100644 --- a/jenkins-scripts/lib/dependencies_archive.sh +++ b/jenkins-scripts/lib/dependencies_archive.sh @@ -55,18 +55,18 @@ BREW_BASE_DEPENDCIES="git cmake" # 1. SDFORMAT # ruby for xml_schemas generation and libxml2-utils for xmllint used in tests -SDFORMAT_NO_IGN_DEPENDENCIES="${pythonv} \\ +SDFORMAT_NO_GZ_DEPENDENCIES="${pythonv} \\ libxml2-utils \\ libtinyxml-dev" # SDFORMAT 10 and above use tinyxml2 if [[ ${SDFORMAT_MAJOR_VERSION} -ge 10 ]]; then - SDFORMAT_NO_IGN_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ + SDFORMAT_NO_GZ_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES} \\ libtinyxml2-dev" fi if [[ ${SDFORMAT_MAJOR_VERSION} -lt 8 ]]; then -SDFORMAT_NO_IGN_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ +SDFORMAT_NO_GZ_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES} \\ libboost-system-dev \\ libboost-filesystem-dev \\ libboost-program-options-dev \\ @@ -74,7 +74,7 @@ SDFORMAT_NO_IGN_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ libboost-iostreams-dev" fi -SDFORMAT_NO_IGN_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ +SDFORMAT_NO_GZ_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES} \\ ruby-dev \\ ruby" @@ -86,17 +86,17 @@ fi if [[ ${SDFORMAT_MAJOR_VERSION} -ge 9 && ${SDFORMAT_MAJOR_VERSION} -lt 13 ]]; then # sdformat9 requires ignition-math6 and # uses ignition-tools for a test - SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ + SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES} \\ libignition-math6-dev \\ libignition-tools-dev" elif [[ ${SDFORMAT_MAJOR_VERSION} -eq 6 ]]; then # sdformat6 requires ignition-math4 and # uses ignition-tools for a test - SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES} \\ + SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES} \\ libignition-math4-dev \\ libignition-tools-dev" else - SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_IGN_DEPENDENCIES}" + SDFORMAT_BASE_DEPENDENCIES="${SDFORMAT_NO_GZ_DEPENDENCIES}" fi # GAZEBO related dependencies. Default value points to the development version @@ -392,15 +392,15 @@ fi # # Completely rely on packages.apt from Garden -if [[ ${IGN_MATH_MAJOR_VERSION} -lt 7 ]]; then - if [[ ${IGN_MATH_MAJOR_VERSION} -eq 4 ]]; then - IGN_MATH_DEPENDENCIES="libeigen3-dev \\ +if [[ ${GZ_MATH_MAJOR_VERSION} -lt 7 ]]; then + if [[ ${GZ_MATH_MAJOR_VERSION} -eq 4 ]]; then + GZ_MATH_DEPENDENCIES="libeigen3-dev \\ libpython3-dev \\ ruby-dev \\ swig \\ libignition-cmake-dev" else - IGN_MATH_DEPENDENCIES="libeigen3-dev \\ + GZ_MATH_DEPENDENCIES="libeigen3-dev \\ libpython3-dev \\ ruby-dev \\ swig \\ @@ -410,13 +410,13 @@ fi # IGN_TRANSPORT related dependencies. Default value points to the development # version -if [[ -z ${IGN_TRANSPORT_MAJOR_VERSION} ]]; then - IGN_TRANSPORT_MAJOR_VERSION=5 +if [[ -z ${GZ_TRANSPORT_MAJOR_VERSION} ]]; then + GZ_TRANSPORT_MAJOR_VERSION=5 fi # Completely rely on packages.apt from Garden -if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -lt 12 ]]; then - IGN_TRANSPORT_NO_IGN_DEPENDENCIES="pkg-config \\ +if [[ ${GZ_TRANSPORT_MAJOR_VERSION} -lt 12 ]]; then + GZ_TRANSPORT_NO_GZ_DEPENDENCIES="pkg-config \\ ${pythonv} \\ ruby-ronn \\ libprotoc-dev \\ @@ -425,23 +425,23 @@ if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -lt 12 ]]; then uuid-dev \\ libzmq3-dev \\ libczmq-dev" - if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -eq 4 ]]; then - export IGN_TRANSPORT_DEPENDENCIES="${IGN_TRANSPORT_NO_IGN_DEPENDENCIES} \\ + if [[ ${GZ_TRANSPORT_MAJOR_VERSION} -eq 4 ]]; then + export GZ_TRANSPORT_DEPENDENCIES="${GZ_TRANSPORT_NO_GZ_DEPENDENCIES} \\ libignition-cmake-dev \\ libignition-msgs-dev" - elif [[ ${IGN_TRANSPORT_MAJOR_VERSION} -ge 8 ]]; then - export IGN_TRANSPORT_DEPENDENCIES="${IGN_TRANSPORT_NO_IGN_DEPENDENCIES} \\ + elif [[ ${GZ_TRANSPORT_MAJOR_VERSION} -ge 8 ]]; then + export GZ_TRANSPORT_DEPENDENCIES="${GZ_TRANSPORT_NO_GZ_DEPENDENCIES} \\ libignition-cmake2-dev \\ libignition-msgs5-dev \\ libsqlite3-dev \\ ruby-ffi" fi - export IGN_TRANSPORT_DEPENDENCIES="${IGN_TRANSPORT_DEPENDENCIES} libignition-tools-dev" + export GZ_TRANSPORT_DEPENDENCIES="${GZ_TRANSPORT_DEPENDENCIES} libignition-tools-dev" fi # Completely rely on packages.apt from Garden -if [[ ${IGN_COMMON_MAJOR_VERSION} -lt 5 ]]; then - IGN_COMMON_NO_IGN_DEPENDENCIES="pkg-config \\ +if [[ ${GZ_COMMON_MAJOR_VERSION} -lt 5 ]]; then + GZ_COMMON_NO_GZ_DEPENDENCIES="pkg-config \\ ${pythonv} \\ ruby-ronn \\ uuid-dev \\ @@ -455,7 +455,7 @@ if [[ ${IGN_COMMON_MAJOR_VERSION} -lt 5 ]]; then libtinyxml2-dev \\ uuid-dev" - IGN_COMMON_DEPENDENCIES="${IGN_COMMON_NO_IGN_DEPENDENCIES} \\ + GZ_COMMON_DEPENDENCIES="${GZ_COMMON_NO_GZ_DEPENDENCIES} \\ libignition-cmake-dev \\ libignition-cmake2-dev \\ libignition-math4-dev \\ @@ -463,8 +463,8 @@ if [[ ${IGN_COMMON_MAJOR_VERSION} -lt 5 ]]; then fi # Completely rely on packages.apt from Garden -if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -lt 8 ]]; then - IGN_FUEL_TOOLS_DEPENDENCIES="libignition-cmake2-dev \\ +if [[ ${GZ_FUEL_TOOLS_MAJOR_VERSION} -lt 8 ]]; then + GZ_FUEL_TOOLS_DEPENDENCIES="libignition-cmake2-dev \\ libignition-common3-dev \\ libignition-tools-dev \\ libcurl4-openssl-dev \\ @@ -472,26 +472,26 @@ if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -lt 8 ]]; then libyaml-dev \\ libzip-dev" - if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -eq 1 ]]; then - IGN_FUEL_TOOLS_DEPENDENCIES="${IGN_FUEL_TOOLS_DEPENDENCIES} \\ + if [[ ${GZ_FUEL_TOOLS_MAJOR_VERSION} -eq 1 ]]; then + GZ_FUEL_TOOLS_DEPENDENCIES="${GZ_FUEL_TOOLS_DEPENDENCIES} \\ libignition-cmake-dev \\ libignition-common-dev" else - IGN_FUEL_TOOLS_DEPENDENCIES="${IGN_FUEL_TOOLS_DEPENDENCIES} \\ + GZ_FUEL_TOOLS_DEPENDENCIES="${GZ_FUEL_TOOLS_DEPENDENCIES} \\ libignition-cmake2-dev \\ libignition-common3-dev \\ libtinyxml2-dev" fi - if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -ge 4 ]]; then - IGN_FUEL_TOOLS_DEPENDENCIES="${IGN_FUEL_TOOLS_DEPENDENCIES} \\ + if [[ ${GZ_FUEL_TOOLS_MAJOR_VERSION} -ge 4 ]]; then + GZ_FUEL_TOOLS_DEPENDENCIES="${GZ_FUEL_TOOLS_DEPENDENCIES} \\ libignition-msgs5-dev" fi fi # Completely rely on packages.apt from Garden -if [[ ${IGN_MSGS_MAJOR_VERSION} -lt 9 ]]; then - IGN_MSGS_DEPENDENCIES="libignition-tools-dev \\ +if [[ ${GZ_MSGS_MAJOR_VERSION} -lt 9 ]]; then + GZ_MSGS_DEPENDENCIES="libignition-tools-dev \\ libprotobuf-dev \\ libprotoc-dev \\ protobuf-compiler \\ @@ -499,20 +499,20 @@ if [[ ${IGN_MSGS_MAJOR_VERSION} -lt 9 ]]; then ruby \\ ruby-dev" - if [[ -n ${IGN_MSGS_MAJOR_VERSION} && ${IGN_MSGS_MAJOR_VERSION} -eq 1 ]]; then - IGN_MSGS_DEPENDENCIES="${IGN_MSGS_DEPENDENCIES} \\ + if [[ -n ${GZ_MSGS_MAJOR_VERSION} && ${GZ_MSGS_MAJOR_VERSION} -eq 1 ]]; then + GZ_MSGS_DEPENDENCIES="${GZ_MSGS_DEPENDENCIES} \\ libignition-cmake-dev \\ libignition-math4-dev" - elif [[ -n ${IGN_MSGS_MAJOR_VERSION} && ${IGN_MSGS_MAJOR_VERSION} -ge 5 ]]; then - IGN_MSGS_DEPENDENCIES="${IGN_MSGS_DEPENDENCIES} \\ + elif [[ -n ${GZ_MSGS_MAJOR_VERSION} && ${GZ_MSGS_MAJOR_VERSION} -ge 5 ]]; then + GZ_MSGS_DEPENDENCIES="${GZ_MSGS_DEPENDENCIES} \\ libignition-cmake2-dev \\ libignition-math6-dev" fi fi # Completely rely on packages.apt from Garden -if [[ ${IGN_GUI_MAJOR_VERSION} -lt 7 ]]; then - IGN_GUI_NO_IGN_DEPENDENCIES="qtbase5-dev \\ +if [[ ${GZ_GUI_MAJOR_VERSION} -lt 7 ]]; then + GZ_GUI_NO_GZ_DEPENDENCIES="qtbase5-dev \\ qtdeclarative5-dev \\ libtinyxml2-dev \\ libqwt-qt5-dev \\ @@ -530,18 +530,18 @@ if [[ ${IGN_GUI_MAJOR_VERSION} -lt 7 ]]; then qml-module-qtquick-window2 \\ qml-module-qtquick2 \\ qtquickcontrols2-5-dev" - IGN_GUI_DEPENDENCIES="${IGN_GUI_NO_IGN_DEPENDENCIES} \\ + GZ_GUI_DEPENDENCIES="${GZ_GUI_NO_GZ_DEPENDENCIES} \\ libignition-cmake2-dev \\ libignition-common3-dev \\ libignition-math6-dev \\ libignition-plugin-dev \\ libignition-tools-dev" - if [[ -n "${IGN_GUI_MAJOR_VERSION}" && ${IGN_GUI_MAJOR_VERSION} -ge 4 ]]; then - IGN_GUI_DEPENDENCIES="${IGN_GUI_DEPENDENCIES} \\ + if [[ -n "${GZ_GUI_MAJOR_VERSION}" && ${GZ_GUI_MAJOR_VERSION} -ge 4 ]]; then + GZ_GUI_DEPENDENCIES="${GZ_GUI_DEPENDENCIES} \\ libignition-common3-dev" - elif [[ -n "${IGN_GUI_MAJOR_VERSION}" && ${IGN_GUI_MAJOR_VERSION} -eq 3 ]]; then - IGN_GUI_DEPENDENCIES="${IGN_GUI_DEPENDENCIES} \\ + elif [[ -n "${GZ_GUI_MAJOR_VERSION}" && ${GZ_GUI_MAJOR_VERSION} -eq 3 ]]; then + GZ_GUI_DEPENDENCIES="${GZ_GUI_DEPENDENCIES} \\ libignition-common3-dev \\ libignition-msgs5-dev \\ libignition-rendering3-dev \\ @@ -552,13 +552,13 @@ fi IGN_PHYSICS_DART_FROM_PKGS="true" # Completely rely on packages.apt from Garden -if [[ ${IGN_PLUGIN_MAJOR_VERSION} -lt 2 ]]; then - IGN_PLUGIN_DEPENDENCIES="libignition-cmake2-dev" +if [[ ${GZ_PLUGIN_MAJOR_VERSION} -lt 2 ]]; then + GZ_PLUGIN_DEPENDENCIES="libignition-cmake2-dev" fi # Completely rely on packages.apt from Garden -if [[ ${IGN_LAUNCH_MAJOR_VERSION} -lt 6 ]]; then - IGN_LAUNCH_COMMON_DEPENDENCIES="libignition-cmake2-dev \\ +if [[ ${GZ_LAUNCH_MAJOR_VERSION} -lt 6 ]]; then + GZ_LAUNCH_COMMON_DEPENDENCIES="libignition-cmake2-dev \\ libignition-common3-dev \\ libignition-math6-dev \\ libignition-plugin-dev \\ @@ -567,8 +567,8 @@ if [[ ${IGN_LAUNCH_MAJOR_VERSION} -lt 6 ]]; then qtquickcontrols2-5-dev \\ libqt5core5a" - if [[ -n "${IGN_LAUNCH_MAJOR_VERSION}" && ${IGN_LAUNCH_MAJOR_VERSION} -ge 3 ]]; then - IGN_LAUNCH_DEPENDENCIES="${IGN_LAUNCH_COMMON_DEPENDENCIES} \\ + if [[ -n "${GZ_LAUNCH_MAJOR_VERSION}" && ${GZ_LAUNCH_MAJOR_VERSION} -ge 3 ]]; then + GZ_LAUNCH_DEPENDENCIES="${GZ_LAUNCH_COMMON_DEPENDENCIES} \\ libignition-gui4-dev \\ libignition-fuel-tools5-dev \\ libignition-gazebo4-dev \\ @@ -578,7 +578,7 @@ if [[ ${IGN_LAUNCH_MAJOR_VERSION} -lt 6 ]]; then libignition-transport9-dev \\ libsdformat10-dev" else - IGN_LAUNCH_DEPENDENCIES="${IGN_LAUNCH_DEPENDENCIES} \\ + GZ_LAUNCH_DEPENDENCIES="${GZ_LAUNCH_DEPENDENCIES} \\ libignition-gui3-dev \\ libignition-fuel-tools4-dev \\ libignition-gazebo3-dev \\ @@ -593,8 +593,8 @@ if [[ ${IGN_LAUNCH_MAJOR_VERSION} -lt 6 ]]; then fi # Completely rely on packages.apt from Garden -if [[ ${IGN_RENDERING_MAJOR_VERSION} -lt 7 ]]; then - IGN_RENDERING_NO_IGN_DEPENDENCIES="${ogre_pkg}\\ +if [[ ${GZ_RENDERING_MAJOR_VERSION} -lt 7 ]]; then + GZ_RENDERING_NO_GZ_DEPENDENCIES="${ogre_pkg}\\ freeglut3-dev \\ libfreeimage-dev \\ libglew-dev \\ @@ -603,7 +603,7 @@ if [[ ${IGN_RENDERING_MAJOR_VERSION} -lt 7 ]]; then mesa-common-dev \\ mesa-utils" - IGN_RENDERING_DEPENDENCIES="${IGN_RENDERING_NO_IGN_DEPENDENCIES} \\ + GZ_RENDERING_DEPENDENCIES="${GZ_RENDERING_NO_GZ_DEPENDENCIES} \\ libignition-cmake2-dev \\ libignition-common3-dev \\ libignition-plugin-dev \\ @@ -611,21 +611,21 @@ if [[ ${IGN_RENDERING_MAJOR_VERSION} -lt 7 ]]; then fi # Completely rely on packages.apt from Garden -if [[ ${IGN_SENSORS_MAJOR_VERSION} -lt 7 ]]; then - IGN_SENSORS_DEPENDENCIES="libignition-common3-dev \\ +if [[ ${GZ_SENSORS_MAJOR_VERSION} -lt 7 ]]; then + GZ_SENSORS_DEPENDENCIES="libignition-common3-dev \\ libignition-cmake2-dev \\ libignition-math6-dev \\ libignition-plugin-dev \\ libignition-tools-dev" - if [[ -n "${IGN_SENSORS_MAJOR_VERSION}" && ${IGN_SENSORS_MAJOR_VERSION} -ge 4 ]]; then - IGN_SENSORS_DEPENDENCIES="${IGN_SENSORS_DEPENDENCIES} \\ + if [[ -n "${GZ_SENSORS_MAJOR_VERSION}" && ${GZ_SENSORS_MAJOR_VERSION} -ge 4 ]]; then + GZ_SENSORS_DEPENDENCIES="${GZ_SENSORS_DEPENDENCIES} \\ libignition-msgs6-dev \\ libignition-rendering4-dev \\ libignition-transport9-dev \\ libsdformat10-dev" - elif [[ -n "${IGN_SENSORS_MAJOR_VERSION}" && ${IGN_SENSORS_MAJOR_VERSION} -ge 3 ]]; then - IGN_SENSORS_DEPENDENCIES="${IGN_SENSORS_DEPENDENCIES} \\ + elif [[ -n "${GZ_SENSORS_MAJOR_VERSION}" && ${GZ_SENSORS_MAJOR_VERSION} -ge 3 ]]; then + GZ_SENSORS_DEPENDENCIES="${GZ_SENSORS_DEPENDENCIES} \\ libignition-msgs5-dev \\ libignition-rendering3-dev \\ libignition-transport8-dev \\ @@ -634,18 +634,18 @@ if [[ ${IGN_SENSORS_MAJOR_VERSION} -lt 7 ]]; then fi # Completely rely on packages.apt from Garden -if [[ ${IGN_GAZEBO_MAJOR_VERSION} -lt 7 ]]; then - IGN_GAZEBO_DEPENDENCIES="libignition-common3-dev \\ +if [[ ${GZ_SIM_MAJOR_VERSION} -lt 7 ]]; then + GZ_SIM_DEPENDENCIES="libignition-common3-dev \\ libignition-cmake2-dev \\ libgflags-dev \\ libignition-math6-dev \\ libignition-math6-eigen3-dev \\ libbenchmark-dev" - if [[ -n "${IGN_GAZEBO_MAJOR_VERSION}" && ${IGN_GAZEBO_MAJOR_VERSION} -ge 4 ]]; then - IGN_GAZEBO_DEPENDENCIES="${IGN_GAZEBO_DEPENDENCIES} \\ + if [[ -n "${GZ_SIM_MAJOR_VERSION}" && ${GZ_SIM_MAJOR_VERSION} -ge 4 ]]; then + GZ_SIM_DEPENDENCIES="${GZ_SIM_DEPENDENCIES} \\ libsdformat10-dev" - elif [[ -n "${IGN_GAZEBO_MAJOR_VERSION}" && ${IGN_GAZEBO_MAJOR_VERSION} -eq 3 ]]; then - IGN_GAZEBO_DEPENDENCIES="${IGN_GAZEBO_DEPENDENCIES} \\ + elif [[ -n "${GZ_SIM_MAJOR_VERSION}" && ${GZ_SIM_MAJOR_VERSION} -eq 3 ]]; then + GZ_SIM_DEPENDENCIES="${GZ_SIM_DEPENDENCIES} \\ libignition-fuel-tools4-dev \\ libignition-gui3-dev \\ libignition-msgs5-dev \\ @@ -661,6 +661,6 @@ if [[ ${IGN_GAZEBO_MAJOR_VERSION} -lt 7 ]]; then fi # Completely rely on packages.apt from Garden -if [[ ${IGN_UTILS_MAJOR_VERSION} -lt 2 ]]; then - IGN_UTILS_DEPENDENCIES="libignition-cmake2-dev" +if [[ ${GZ_UTILS_MAJOR_VERSION} -lt 2 ]]; then + GZ_UTILS_DEPENDENCIES="libignition-cmake2-dev" fi diff --git a/jenkins-scripts/lib/sdformat-base-windows.bat b/jenkins-scripts/lib/sdformat-base-windows.bat index 9ea8ba71b..a31286de3 100644 --- a/jenkins-scripts/lib/sdformat-base-windows.bat +++ b/jenkins-scripts/lib/sdformat-base-windows.bat @@ -1,7 +1,7 @@ :: sdformat base script :: :: Parameters: -:: - USE_IGNITION_ZIP : (default true) [true | false]. Use zip to install ignition +:: - USE_GZ_ZIP : (default true) [true | false]. Use zip to install ignition :: instead of compile :: - BUILD_TYPE : (default Release) [ Release | Debug ] Build type to use :: @@ -13,7 +13,7 @@ findstr /r /b "find_package(ignition-math" %WORKSPACE%\sdformat\cmake\SearchForS set /p IGN_MATH_REQUIRED_VERSION= install_boost.log -IF %USE_IGNITION_ZIP% == TRUE ( +IF %USE_GZ_ZIP% == TRUE ( call %win_lib% :wget http://packages.osrfoundation.org/win32/deps/%IGNMATH_ZIP%.zip %IGNMATH_ZIP%.zip call %win_lib% :unzip_7za %IGNMATH_ZIP%.zip ) From bbbff52b082b9826c19cf5b812918a04cd4951fa Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 16 Jun 2022 16:47:35 -0700 Subject: [PATCH 3/6] TRIAL: Migrate BUILD_IGN_XXX type variables Signed-off-by: methylDragon --- .../_generic_linux_compilation_build.sh.bash | 4 +- .../docker/lib/gazebo-base-default.bash | 24 +++++----- .../docker/lib/generic-building-base.bash | 44 +++++++++---------- jenkins-scripts/dsl/gazebo.dsl | 4 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash b/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash index 8576dcb68..9d63185d9 100644 --- a/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash +++ b/jenkins-scripts/docker/lib/_generic_linux_compilation_build.sh.bash @@ -7,7 +7,7 @@ # - GENERIC_ENABLE_TESTS (optional) [default true] run tests # - BUILDING_EXTRA_CMAKE_PARAMS (optional) extra cmake params # - BUILDING_EXTRA_MAKETEST_PARAMS (optional) extra "make test ARGS=" params -# - BUILD_ (optional) build dependency from source, for example, BUILD_IGN_MATH +# - BUILD_ (optional) build dependency from source, for example, BUILD_GZ_MATH # - _BRANCH (optional [default: master]) branch for BUILD_ if [[ -z ${SOFTWARE_DIR} ]]; then @@ -29,7 +29,7 @@ fi DELIM_HEADER # Process the source build of dependencies if needed -OSRF_DEPS="IGN_CMAKE IGN_UTILS IGN_TOOLS IGN_MATH IGN_MSGS IGN_TRANSPORT IGN_COMMON IGN_FUEL_TOOLS SDFORMAT IGN_PHYSICS IGN_RENDERING IGN_SENSORS IGN_GUI IGN_GAZEBO" +OSRF_DEPS="GZ_CMAKE GZ_UTILS GZ_TOOLS GZ_MATH GZ_MSGS GZ_TRANSPORT GZ_COMMON GZ_FUEL_TOOLS SDFORMAT GZ_PHYSICS GZ_RENDERING GZ_SENSORS GZ_GUI GZ_SIM" OSRF_DEPS_DONE="" for dep_uppercase in $OSRF_DEPS; do dep=`echo $dep_uppercase | tr '[:upper:]' '[:lower:]'` diff --git a/jenkins-scripts/docker/lib/gazebo-base-default.bash b/jenkins-scripts/docker/lib/gazebo-base-default.bash index 4bce4453d..db2441ce8 100644 --- a/jenkins-scripts/docker/lib/gazebo-base-default.bash +++ b/jenkins-scripts/docker/lib/gazebo-base-default.bash @@ -6,13 +6,13 @@ # piece of code to run in the testing section # - GAZEBO_BUILD_$DEP (optional) [default false] # build dependencies from source. -# DEP = SDFORMAT | IGN_MATH | IGN_TRANSPORT | IGN_GUI | IGN_COMMON +# DEP = SDFORMAT | GZ_MATH | GZ_TRANSPORT | GZ_GUI | GZ_COMMON # branch parameter = $DEP_BRANCH #stop on error set -e -GAZEBO_OSRF_DEPS="SDFORMAT IGN_MATH IGN_TRANSPORT IGN_GUI IGN_COMMON" +GAZEBO_OSRF_DEPS="SDFORMAT GZ_MATH GZ_TRANSPORT GZ_GUI GZ_COMMON" . ${SCRIPT_DIR}/lib/_gazebo_version_hook.bash @@ -242,28 +242,28 @@ DEPENDENCY_PKGS="${BASE_DEPENDENCIES} \ ${GAZEBO_EXTRA_DEPENDENCIES} \ ${EXTRA_PACKAGES}" -[[ -z ${GAZEBO_BUILD_IGN_MATH} ]] && GAZEBO_BUILD_IGN_MATH=false -if $GAZEBO_BUILD_IGN_MATH; then +[[ -z ${GAZEBO_BUILD_GZ_MATH} ]] && GAZEBO_BUILD_GZ_MATH=false +if $GAZEBO_BUILD_GZ_MATH; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MATH_DEPENDENCIES}" fi -[[ -z ${GAZEBO_BUILD_IGN_MSGS} ]] && GAZEBO_BUILD_IGN_MSGS=false -if $GAZEBO_BUILD_IGN_MSGS; then +[[ -z ${GAZEBO_BUILD_GZ_MSGS} ]] && GAZEBO_BUILD_GZ_MSGS=false +if $GAZEBO_BUILD_GZ_MSGS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MSGS_DEPENDENCIES}" fi -[[ -z ${GAZEBO_BUILD_IGN_TRANSPORT} ]] && GAZEBO_BUILD_IGN_TRANSPORT=false -if $GAZEBO_BUILD_IGN_TRANSPORT; then +[[ -z ${GAZEBO_BUILD_GZ_TRANSPORT} ]] && GAZEBO_BUILD_GZ_TRANSPORT=false +if $GAZEBO_BUILD_GZ_TRANSPORT; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TRANSPORT_DEPENDENCIES}" fi -[[ -z ${GAZEBO_BUILD_IGN_GUI} ]] && GAZEBO_BUILD_IGN_GUI=false -if $GAZEBO_BUILD_IGN_GUI; then +[[ -z ${GAZEBO_BUILD_GZ_GUI} ]] && GAZEBO_BUILD_GZ_GUI=false +if $GAZEBO_BUILD_GZ_GUI; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_GUI_DEPENDENCIES}" fi -[[ -z ${GAZEBO_BUILD_IGN_COMMON} ]] && GAZEBO_BUILD_IGN_COMMON=false -if $GAZEBO_BUILD_IGN_COMMON; then +[[ -z ${GAZEBO_BUILD_GZ_COMMON} ]] && GAZEBO_BUILD_GZ_COMMON=false +if $GAZEBO_BUILD_GZ_COMMON; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_COMMON_DEPENDENCIES}" fi diff --git a/jenkins-scripts/docker/lib/generic-building-base.bash b/jenkins-scripts/docker/lib/generic-building-base.bash index 1b79f1a27..846d0014d 100644 --- a/jenkins-scripts/docker/lib/generic-building-base.bash +++ b/jenkins-scripts/docker/lib/generic-building-base.bash @@ -12,18 +12,18 @@ fi OSRF_REPOS_TO_USE=${BUILDING_JOB_REPOSITORIES} DEPENDENCY_PKGS="${BASE_DEPENDENCIES} ${ARCHIVE_PROJECT_DEPENDECIES} ${BUILDING_DEPENDENCIES}" -[[ -z ${BUILD_IGN_MATH} ]] && BUILD_IGN_MATH=false -if $BUILD_IGN_MATH; then +[[ -z ${BUILD_GZ_MATH} ]] && BUILD_GZ_MATH=false +if $BUILD_GZ_MATH; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MATH_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_MSGS} ]] && BUILD_IGN_MSGS=false -if $BUILD_IGN_MSGS; then +[[ -z ${BUILD_GZ_MSGS} ]] && BUILD_GZ_MSGS=false +if $BUILD_GZ_MSGS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_MSGS_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_TRANSPORT} ]] && BUILD_IGN_TRANSPORT=false -if $BUILD_IGN_TRANSPORT; then +[[ -z ${BUILD_GZ_TRANSPORT} ]] && BUILD_GZ_TRANSPORT=false +if $BUILD_GZ_TRANSPORT; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TRANSPORT_DEPENDENCIES}" fi @@ -32,38 +32,38 @@ if $BUILD_GZ_SIM; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_SIM_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_GUI} ]] && BUILD_IGN_GUI=false -if $BUILD_IGN_GUI; then +[[ -z ${BUILD_GZ_GUI} ]] && BUILD_GZ_GUI=false +if $BUILD_GZ_GUI; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_GUI_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_COMMON} ]] && BUILD_IGN_COMMON=false -if $BUILD_IGN_COMMON; then +[[ -z ${BUILD_GZ_COMMON} ]] && BUILD_GZ_COMMON=false +if $BUILD_GZ_COMMON; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_COMMON_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_FUEL_TOOLS} ]] && BUILD_IGN_FUEL_TOOLS=false -if $BUILD_IGN_FUEL_TOOLS; then +[[ -z ${BUILD_GZ_FUEL_TOOLS} ]] && BUILD_GZ_FUEL_TOOLS=false +if $BUILD_GZ_FUEL_TOOLS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_FUEL_TOOLS_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_SENSORS} ]] && BUILD_IGN_SENSORS=false -if $BUILD_IGN_SENSORS; then +[[ -z ${BUILD_GZ_SENSORS} ]] && BUILD_GZ_SENSORS=false +if $BUILD_GZ_SENSORS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_SENSORS_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_PHYSICS} ]] && BUILD_IGN_PHYSICS=false -if $BUILD_IGN_PHYSICS; then +[[ -z ${BUILD_GZ_PHYSICS} ]] && BUILD_GZ_PHYSICS=false +if $BUILD_GZ_PHYSICS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_PHYSICS_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_RENDERING} ]] && BUILD_IGN_RENDERING=false -if $BUILD_IGN_RENDERING; then +[[ -z ${BUILD_GZ_RENDERING} ]] && BUILD_GZ_RENDERING=false +if $BUILD_GZ_RENDERING; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_RENDERING_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_TOOLS} ]] && BUILD_IGN_TOOLS=false -if $BUILD_IGN_TOOLS; then +[[ -z ${BUILD_GZ_TOOLS} ]] && BUILD_GZ_TOOLS=false +if $BUILD_GZ_TOOLS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_TOOLS_DEPENDENCIES}" fi @@ -72,8 +72,8 @@ if $BUILD_SDFORMAT; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${SDFORMAT_BASE_DEPENDENCIES}" fi -[[ -z ${BUILD_IGN_UTILS} ]] && BUILD_IGN_UTILS=false -if $BUILD_IGN_UTILS; then +[[ -z ${BUILD_GZ_UTILS} ]] && BUILD_GZ_UTILS=false +if $BUILD_GZ_UTILS; then DEPENDENCY_PKGS="${DEPENDENCY_PKGS} ${GZ_UTILS_BASE_DEPENDENCIES}" fi diff --git a/jenkins-scripts/dsl/gazebo.dsl b/jenkins-scripts/dsl/gazebo.dsl index 336fa2d6e..d947b587a 100644 --- a/jenkins-scripts/dsl/gazebo.dsl +++ b/jenkins-scripts/dsl/gazebo.dsl @@ -216,8 +216,8 @@ ci_distro.each { distro -> export ARCH=${arch} export GPU_SUPPORT_NEEDED=true export GAZEBO_BUILD_SDFORMAT=true - export GAZEBO_BUILD_IGN_MATH=true - export GAZEBO_BUILD_IGN_TRANSPORT=true + export GAZEBO_BUILD_GZ_MATH=true + export GAZEBO_BUILD_GZ_TRANSPORT=true /bin/bash -xe ./scripts/jenkins-scripts/docker/gazebo-compilation.bash """.stripIndent()) } From 7151d843ce9c132ffb8decb8e95bc9283f44ce23 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Tue, 9 Aug 2022 15:33:55 -0700 Subject: [PATCH 4/6] Revert erroneous dependency changes Signed-off-by: methylDragon --- jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat | 2 +- jenkins-scripts/ign_launch-default-devel-windows-amd64.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat index 5eabe7693..2b057d01d 100644 --- a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat @@ -5,7 +5,7 @@ set VCS_DIRECTORY=gz-sim set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true :: dlfcn -set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq +set DEPEN_PKGS=assimp boost-core ccd cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf qt5 qwt tinyxml2 zeromq for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i if %GZ_MAJOR_VERSION% GEQ 7 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal diff --git a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat index 36dfeadf8..19b8edbe2 100644 --- a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat @@ -4,7 +4,7 @@ set VCS_DIRECTORY=gz-launch set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq +set DEPEN_PKGS=assimp boost-core ccd cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf qt5 qwt tinyxml2 zeromq for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i if %GZ_MAJOR_VERSION% GEQ 6 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal From 10e9e12d2cfe5fffd9f8d0b4e37712f195e870ab Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 17 Aug 2022 01:21:05 +0200 Subject: [PATCH 5/6] Windows fixes for 753 (ign -> gz) (#792) * Reverse the logic for package names * Remove redundant code. Always called from colcon which has the same logic --- .../ign_tools-default-devel-windows-amd64.bat | 6 +++--- .../lib/colcon-default-devel-windows.bat | 6 +++--- jenkins-scripts/lib/windows_library.bat | 15 +-------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat b/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat index b6a7ce39e..89b4adff8 100644 --- a/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat @@ -16,14 +16,14 @@ if "!PKG_MAJOR_VERSION!" == "1" ( set COLCON_PACKAGE=%COLCON_PACKAGE%!PKG_MAJOR_VERSION! ) -echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from ignition to gz if needed +echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from gz to ignition echo Packages in workspace: colcon list --names-only colcon list --names-only | find "!COLCON_PACKAGE!" if errorlevel 1 ( - set COLCON_PACKAGE=%COLCON_PACKAGE:ignition=gz% - set COLCON_PACKAGE=!COLCON_PACKAGE:gazebo=sim! + set COLCON_PACKAGE=!COLCON_PACKAGE:gz=ignition! + set COLCON_PACKAGE=!COLCON_PACKAGE:sim=gazebo! ) colcon list --names-only | find "!COLCON_PACKAGE!" if errorlevel 1 ( diff --git a/jenkins-scripts/lib/colcon-default-devel-windows.bat b/jenkins-scripts/lib/colcon-default-devel-windows.bat index 7dbdfeb8a..7c2aac7a7 100644 --- a/jenkins-scripts/lib/colcon-default-devel-windows.bat +++ b/jenkins-scripts/lib/colcon-default-devel-windows.bat @@ -36,14 +36,14 @@ if "%COLCON_AUTO_MAJOR_VERSION%" == "true" ( ) :: Check if package is in colcon workspace -echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from ignition to gz if needed +echo # BEGIN SECTION: Update package !COLCON_PACKAGE! from gz to ignition echo Packages in workspace: colcon list --names-only colcon list --names-only | find "!COLCON_PACKAGE!" if errorlevel 1 ( - set COLCON_PACKAGE=!COLCON_PACKAGE:ignition=gz! - set COLCON_PACKAGE=!COLCON_PACKAGE:gazebo=sim! + set COLCON_PACKAGE=!COLCON_PACKAGE:gz=ignition! + set COLCON_PACKAGE=!COLCON_PACKAGE:sim=gazebo! ) colcon list --names-only | find "!COLCON_PACKAGE!" if errorlevel 1 ( diff --git a/jenkins-scripts/lib/windows_library.bat b/jenkins-scripts/lib/windows_library.bat index 7f5f54d79..1b5b90990 100644 --- a/jenkins-scripts/lib/windows_library.bat +++ b/jenkins-scripts/lib/windows_library.bat @@ -211,21 +211,8 @@ goto :EOF set COLCON_PACKAGE=%1 :: Check if package is in colcon workspace -echo # BEGIN SECTION: Update package %COLCON_PACKAGE% from ignition to gz if needed -echo Packages in workspace: +echo # BEGIN SECTION Packages in workspace: colcon list --names-only - -colcon list --names-only | find "%COLCON_PACKAGE%" -if errorlevel 1 ( - set COLCON_PACKAGE=!COLCON_PACKAGE:ignition=gz! - set COLCON_PACKAGE=!COLCON_PACKAGE:gazebo=sim! -) -colcon list --names-only | find "!COLCON_PACKAGE!" -if errorlevel 1 ( - echo Failed to find package !COLCON_PACKAGE! in workspace. - goto :error -) -echo Using package name !COLCON_PACKAGE! echo # END SECTION :: two runs to get the dependencies built with testing and the package under From 61384030c3e9a567e801e64b6be92b47038e9095 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 17 Aug 2022 19:54:25 +0200 Subject: [PATCH 6/6] Restore assimp dep --- jenkins-scripts/ign_common-default-devel-windows-amd64.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat index 05f9a219f..39f0ecae9 100644 --- a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat +++ b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat @@ -4,7 +4,7 @@ set VCS_DIRECTORY=gz-common set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true -set DEPEN_PKGS=ffmpeg freeimage gts tinyxml2 +set DEPEN_PKGS=assimp ffmpeg freeimage gts tinyxml2 for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set GZ_MAJOR_VERSION=%%i if %GZ_MAJOR_VERSION% GEQ 5 ( set DEPEN_PKGS=%DEPEN_PKGS% gdal