Skip to content

Commit

Permalink
ign -> gz : Release Tools Migrate Project Names (#752)
Browse files Browse the repository at this point in the history
  • Loading branch information
methylDragon committed Jun 25, 2022
1 parent cf6e4c6 commit cf125a1
Show file tree
Hide file tree
Showing 28 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_cmake-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ if ! [[ ${IGN_CMAKE_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

export GZDEV_PROJECT_NAME="ignition-cmake${IGN_CMAKE_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-cmake${IGN_CMAKE_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_common-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ if [[ ${IGN_COMMON_MAJOR_VERSION} -ge 3 ]]; then
export NEED_C17_COMPILER=true
fi

export GZDEV_PROJECT_NAME="ignition-common${IGN_COMMON_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-common${IGN_COMMON_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_fuel-tools-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ if ! [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

export GZDEV_PROJECT_NAME="ignition-fuel-tools${IGN_FUEL_TOOLS_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-fuel-tools${IGN_FUEL_TOOLS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_gazebo-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ fi
export NEED_C17_COMPILER=true
export GPU_SUPPORT_NEEDED=true

export GZDEV_PROJECT_NAME="ignition-gazebo${IGN_GAZEBO_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-sim${IGN_GAZEBO_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_gui-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ if [[ ${IGN_GUI_MAJOR_VERSION} -ge 1 ]]; then
fi

export GPU_SUPPORT_NEEDED=true
export GZDEV_PROJECT_NAME="ignition-gui${IGN_GUI_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-gui${IGN_GUI_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_launch-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ if ! [[ ${IGN_LAUNCH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
fi

export NEED_C17_COMPILER=true
export GZDEV_PROJECT_NAME="ignition-launch${IGN_LAUNCH_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-launch${IGN_LAUNCH_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_math-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ if [[ ${IGN_MATH_MAJOR_VERSION} -ge 6 ]]; then
export NEED_C17_COMPILER=true
fi

export GZDEV_PROJECT_NAME="ignition-math${IGN_MATH_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-math${IGN_MATH_MAJOR_VERSION}"

. "${SCRIPT_DIR}/lib/generic-building-base.bash"
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_msgs-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ if [[ ${IGN_MSGS_MAJOR_VERSION} -ge 3 ]]; then
export NEED_C17_COMPILER=true
fi

export GZDEV_PROJECT_NAME="ignition-msgs${IGN_MSGS_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-msgs${IGN_MSGS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_physics-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ if ! [[ ${IGN_PHYSICS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
fi

export NEED_C17_COMPILER=true
export GZDEV_PROJECT_NAME="ignition-physics${IGN_PHYSICS_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-physics${IGN_PHYSICS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_plugin-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ if [[ ${IGN_PLUGIN_MAJOR_VERSION} -ge 6 ]]; then
export NEED_C17_COMPILER=true
fi

export GZDEV_PROJECT_NAME="ignition-plugin${IGN_PLUGIN_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-plugin${IGN_PLUGIN_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_rendering-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if [[ ${IGN_RENDERING_MAJOR_VERSION} -ge 1 ]]; then
fi

export GPU_SUPPORT_NEEDED=true
export GZDEV_PROJECT_NAME="ignition-rendering${IGN_RENDERING_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-rendering${IGN_RENDERING_MAJOR_VERSION}"

export BUILDING_EXTRA_CMAKE_PARAMS+=" -DSKIP_optix=true"

Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_sensors-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ fi
export NEED_C17_COMPILER=true

export GPU_SUPPORT_NEEDED=true
export GZDEV_PROJECT_NAME="ignition-sensors${IGN_SENSORS_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-sensors${IGN_SENSORS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_transport-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -ge 6 ]]; then
export NEED_C17_COMPILER=true
fi

export GZDEV_PROJECT_NAME="ignition-transport${IGN_TRANSPORT_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-transport${IGN_TRANSPORT_MAJOR_VERSION}"

. "${SCRIPT_DIR}/lib/generic-building-base.bash"
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/ign_utils-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ fi

export NEED_C17_COMPILER=true

export GZDEV_PROJECT_NAME="ignition-utils${IGN_UTILS_MAJOR_VERSION}"
export GZDEV_PROJECT_NAME="gz-utils${IGN_UTILS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_common-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_gui-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_launch-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_math-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set SCRIPT_DIR=%~dp0
set VCS_DIRECTORY=ign-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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_tools-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set VCS_DIRECTORY=ign-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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion jenkins-scripts/ign_utils-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit cf125a1

Please sign in to comment.