Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot-automerge] gz-sim v8_8.3.0 #54

Merged
merged 6 commits into from
Apr 24, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Create 2382.patch
  • Loading branch information
traversaro authored Apr 24, 2024
commit fc80b6e5abed813c90fdd595d91d1b28ba362f9b
27 changes: 27 additions & 0 deletions recipe/2382.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From d7488a7d1661f79742d71c5cd0f6039f214aca40 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Wed, 24 Apr 2024 12:29:22 +0200
Subject: [PATCH] Permit to run gz sim -g on Windows

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
---
src/cmd/cmdsim.rb.in | 6 ------
1 file changed, 6 deletions(-)

diff --git a/src/cmd/cmdsim.rb.in b/src/cmd/cmdsim.rb.in
index 64ee638c7b..65946d3494 100755
--- a/src/cmd/cmdsim.rb.in
+++ b/src/cmd/cmdsim.rb.in
@@ -598,12 +598,6 @@ See https://github.com/gazebosim/gz-sim/issues/168 for more info."
options['record-period'], options['seed'])
# Otherwise run the gui
else options['gui']
- if plugin.end_with? ".dll"
- puts "`gz sim` currently only works with the -s argument on Windows.
-See https://github.com/gazebosim/gz-sim/issues/168 for more info."
- exit(-1)
- end
-
ENV['RMT_PORT'] = '1501'
Importer.runGui(options['gui_config'], options['file'],
options['wait_gui'], options['render_engine_gui'],
Loading