Skip to content

Commit

Permalink
Remove deprecations: tock
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Agüero <[email protected]>
  • Loading branch information
caguero committed Dec 8, 2024
1 parent d29e212 commit 1b75e7f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
5 changes: 5 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Gazebo Tools 2.X to 3.X

* The environment variable `IGN_CONFIG_PATH` is removed.
Use `GZ_CONFIG_PATH` instead.

## Gazebo Tools 1.X to 2.X

* This package now depends on gz-cmake
Expand Down
14 changes: 9 additions & 5 deletions src/gz.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,8 @@ yaml_found = false

conf_dirs = '@CMAKE_INSTALL_PREFIX@/share/gz/'
conf_dirs = ENV['GZ_CONFIG_PATH'] if ENV.key?('GZ_CONFIG_PATH')

conf_dirs = conf_dirs.split('@ENV_PATH_DELIMITER@')

# Deprecated
conf_dirs.append(ENV['IGN_CONFIG_PATH']) if ENV.key?('IGN_CONFIG_PATH')

conf_dirs.each do |conf_directory|
next if Dir.glob(conf_directory + '/*.yaml').empty?

Expand Down Expand Up @@ -185,7 +181,8 @@ usage = 'The \'gz\' command provides a command line interface to the Gazebo'\

# Used to align the commands and the description.
padding_width = 15
commands.each do |cmd, versions|
commands.keys.sort.each do |cmd|
versions = commands[cmd]
# Calculate the padding to add between the command and the description.
padding_to_apply = padding_width - cmd.size - 1
padding = ''
Expand Down Expand Up @@ -288,6 +285,13 @@ if ARGV.include?('--versions')
exit(0)
end

if defined? RubyInstaller
# RubyInstaller does not search for dlls in PATH
# https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers#-dll-loading
ENV['RUBY_DLL_PATH'] = ENV['PATH']
RubyInstaller::Runtime.enable_dll_search_paths
end

# Start Backward before loading plugins
begin
SharedLibInterface::Importer.dlload '@backward_library_name@'
Expand Down

0 comments on commit 1b75e7f

Please sign in to comment.