From 66b2c4f5d4c4d9b7b04b94bebd51ab4d756234ac Mon Sep 17 00:00:00 2001 From: Moritz Schilling Date: Mon, 20 Jul 2026 12:25:22 +0200 Subject: [PATCH 1/3] Added missing dependency to typelib This is a commit back from xrock_gui_model/bin/xrock-resolve-ports to change back to rock-instantiate. Don't know if this is needed but it has been flagged as a fix by @malter Signed-off-by: Moritz Schilling --- bin/rock-instantiate | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/rock-instantiate b/bin/rock-instantiate index aa317b6..c50c5c5 100644 --- a/bin/rock-instantiate +++ b/bin/rock-instantiate @@ -1,5 +1,6 @@ #! /usr/bin/ruby +require 'typelib' require 'orogen_model_exporter' require 'rock/bundle' require 'optparse' @@ -97,7 +98,7 @@ begin inst = Orocos.get cname begin if options[:config_file] - Orocos.apply_conf(inst, options[:config_file], options[:configs]) + Orocos.apply_conf(inst, options[:config_file], options[:configs], true) else Orocos.conf.apply(inst, options[:configs], true) end From 64c9ae2167edf2304ea41527aa3453d7bb9300e2 Mon Sep 17 00:00:00 2001 From: Moritz Schilling Date: Mon, 10 Aug 2026 14:07:05 +0200 Subject: [PATCH 2/3] Fixed args/kwargs issue when calling Orocos.run without parenthesis --- bin/rock-instantiate | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/rock-instantiate b/bin/rock-instantiate index c50c5c5..dd13c07 100644 --- a/bin/rock-instantiate +++ b/bin/rock-instantiate @@ -92,17 +92,17 @@ Bundles.initialize begin cname = options[:task_model_name]+"__"+options[:configs].join - Orocos.run options[:task_model_name] => cname, + Orocos.run({options[:task_model_name] => cname}, :output => '/tmp/rock-instantiate.log', - :oro_logfile => '/tmp/rock-instantiate-oro.log' do - inst = Orocos.get cname + :oro_logfile => '/tmp/rock-instantiate-oro.log') do + inst = Orocos.get(cname) begin if options[:config_file] Orocos.apply_conf(inst, options[:config_file], options[:configs], true) else Orocos.conf.apply(inst, options[:configs], true) end - inst.configure + inst.configure() rescue ArgumentError => err puts "ERROR: Could not configure Task Context with config sections: " + options[:configs].to_s() + ". The following Error was reported: \n" From 648be098a03a1b1cad03c8570ae30d96ffb2f3f8 Mon Sep 17 00:00:00 2001 From: Moritz Schilling Date: Fri, 14 Aug 2026 10:08:52 +0200 Subject: [PATCH 3/3] Removed probably unnecessary require 'typelib' It is unclear if this has been necessary. Signed-off-by: Moritz Schilling --- bin/rock-instantiate | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/rock-instantiate b/bin/rock-instantiate index dd13c07..c99af98 100644 --- a/bin/rock-instantiate +++ b/bin/rock-instantiate @@ -1,6 +1,5 @@ #! /usr/bin/ruby -require 'typelib' require 'orogen_model_exporter' require 'rock/bundle' require 'optparse'