Skip to content

Commit

Permalink
Fix rosrun python scripts on Windows (#139)
Browse files Browse the repository at this point in the history
* Fix rosrun python scripts on Windows

* Fix path

* Fix rosserial deps

* Rebuild
  • Loading branch information
Tobias-Fischer authored Jun 8, 2021
1 parent 9b99636 commit 801dadf
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 2 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,5 @@ theora_image_transport:
add_build: ["pkg-config"]
image_view:
add_build: ["pkg-config"]
rosserial_python:
add_run: ["pyserial"]
16 changes: 16 additions & 0 deletions patch/ros-noetic-rosbash.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/scripts/rosrun.bat b/scripts/rosrun.bat
index e6c2fb353..d3bbb0803 100644
--- a/scripts/rosrun.bat
+++ b/scripts/rosrun.bat
@@ -112,9 +112,9 @@ for %%a in ("%exepath%") do (
set exepath_extension=%%~xa
)
if "!exepath_extension!" == ".py" (
- call %rosrun_prefix% "%PYTHONHOME%\python.exe" %exepath% %rosrun_args%
+ call %rosrun_prefix% "%CONDA_PREFIX%\python.exe" %exepath% %rosrun_args%
) else if "!exepath_extension!" == "" (
- call %rosrun_prefix% "%PYTHONHOME%\python.exe" %exepath% %rosrun_args%
+ call %rosrun_prefix% "%CONDA_PREFIX%\python.exe" %exepath% %rosrun_args%
) else (
call %rosrun_prefix% %exepath% %rosrun_args%
)
6 changes: 4 additions & 2 deletions vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ conda_index:
- robostack.yaml
- packages-ignore.yaml

build_number: 8
build_number: 9

# Ignore all dependencies of selected packages
skip_all_deps: false
Expand Down Expand Up @@ -34,7 +34,9 @@ packages_select_by_deps:
##
# DONE Win
##
- rviz
- rosserial_python
- rosbash
# - rviz
# - rosserial_windows
# - turtlebot3_fake
# - rosserial
Expand Down

0 comments on commit 801dadf

Please sign in to comment.