p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #122 from mikepurvis/allow-ros-distro-override 

Allow expected ROS_DISTRO value to be overridden at compile time.
This commit is contained in:
Dirk Thomas 2016-09-16 08:48:57 -07:00 committed by GitHub
parent e39d114e1a 5a5f2a1375
commit 4ea42a76d0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/roslib/env-hooks/10.ros.sh.em
View File

@ -3,10 +3,17 @@
# scrub old ROS bin dirs, to avoid accidentally finding the wrong executables # scrub old ROS bin dirs, to avoid accidentally finding the wrong executables
export PATH="`@(PYTHON_EXECUTABLE) -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`" export PATH="`@(PYTHON_EXECUTABLE) -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`"
if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "kinetic" ]; then @{
# This is a build-time environment variable which allows a build engineer to override the expected
# ROS_DISTRO value for a workspace, for example to deliberately use a newer version of roslib with
# an older release or vice-versa, or to define a custom distro (eg, "ROS Banana").
from os import environ
ROS_DISTRO = environ.get("ROS_DISTRO_OVERRIDE", "kinetic")
}@
if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "@(ROS_DISTRO)" ]; then
echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions." echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions."
fi fi
export ROS_DISTRO=kinetic export ROS_DISTRO=@(ROS_DISTRO)
# python function to generate ROS package path based on all workspaces # python function to generate ROS package path based on all workspaces
PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF