Skip to content

Commit 7e89305

Browse files
authored
Use PYTHON_EXECUTABLE to generate config headers. (ros#146)
* Use PYTHON_EXECUTABLE on posix as well. * Fix package.xml description.
1 parent e3e91b9 commit 7e89305

6 files changed

+6
-11
lines changed

cfg/Test.cfg

100755100644
-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#! /usr/bin/env python
21
# Software License Agreement (BSD License)
32
#
43
# Copyright (c) 2009, Willow Garage, Inc.

cmake/dynamic_reconfigure-macros.cmake

+2-4
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ macro(generate_dynamic_reconfigure_options)
4646
)
4747
set("_CUSTOM_PYTHONPATH_ENV" "${CMAKE_CURRENT_BINARY_DIR}/setup_custom_pythonpath.sh")
4848
endif()
49-
elseif(WIN32)
49+
else()
5050
# Package could have no ${CATKIN_GLOBAL_PYTHON_DESTINATION} if it doesn't call
51-
# catkin_python_setup().
52-
# However, since Windows doesn't support shebang, we still need python to be added
53-
# into the _cmd later.
51+
# catkin_python_setup(), however we still need to use the correct Python.
5452
set("_CUSTOM_PYTHONPATH_ENV" "${PYTHON_EXECUTABLE}")
5553
endif()
5654

cmake/setup_custom_pythonpath.bat.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
REM generated from dynamic_reconfigure/cmake/setup_custom_pythonpath.bat.in
22

33
set PYTHONPATH=@CATKIN_DEVEL_PREFIX@/@CATKIN_GLOBAL_PYTHON_DESTINATION@;%PYTHONPATH%
4-
call python %*
4+
call @PYTHON_EXECUTABLE@ %*

cmake/setup_custom_pythonpath.sh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# generated from dynamic_reconfigure/cmake/setup_custom_pythonpath.sh.in
33

44
PYTHONPATH=@CATKIN_DEVEL_PREFIX@/@CATKIN_GLOBAL_PYTHON_DESTINATION@:$PYTHONPATH
5-
exec "$@"
5+
exec @PYTHON_EXECUTABLE@ "$@"

package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<name>dynamic_reconfigure</name>
55
<version>1.6.0</version>
66
<description>
7-
This unary stack contains the dynamic_reconfigure package which provides a means to change
8-
node parameters at any time without having to restart the node.
7+
The dynamic_reconfigure package provides a means to update parameters
8+
at runtime without having to restart the node.
99
</description>
1010
<maintainer email="[email protected]">Michael Carroll</maintainer>
1111
<license>BSD</license>

setup.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env python
2-
31
from distutils.core import setup
42
from catkin_pkg.python_setup import generate_distutils_setup
53

0 commit comments

Comments
 (0)