From 1b75e7ff1c425dd3010632916eb9218eefcd931d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= <caguero@openrobotics.org>
Date: Sun, 8 Dec 2024 11:38:37 +0100
Subject: [PATCH] Remove deprecations: tock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
---
 Migration.md |  5 +++++
 src/gz.in    | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Migration.md b/Migration.md
index ae59219..bf35224 100644
--- a/Migration.md
+++ b/Migration.md
@@ -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
diff --git a/src/gz.in b/src/gz.in
index 14e456f..7346ddc 100755
--- a/src/gz.in
+++ b/src/gz.in
@@ -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?
 
@@ -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 = ''
@@ -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@'