Skip to content

Commit

Permalink
bing
Browse files Browse the repository at this point in the history
  • Loading branch information
Troy D. Straszheim committed Nov 21, 2011
1 parent 6f0eb53 commit a581aa3
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 6 deletions.
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ install(DIRECTORY cmake/
USE_SOURCE_PERMISSIONS
)

#install(
# FILES
# ${CMAKE_CURRENT_BINARY_DIR}/cmake_install/catkin-config.cmake
# DESTINATION share/cmake/catkin
# )
configure_file(setup.sh.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.sh)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.sh
setup.bash
setup.zsh
DESTINATION /
)

catkin_package(catkin)
3 changes: 2 additions & 1 deletion cmake/em/rules.python_distutils.em
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ override_dh_auto_configure:

override_dh_auto_install:
dh_auto_install -Scmake
dh_auto_install -Spython_distutils -- --prefix="@(CMAKE_INSTALL_PREFIX)"
dh_auto_install -Spython_distutils -- \
--prefix="@(CMAKE_INSTALL_PREFIX)" --install-layout=deb

override_dh_auto_build:
dh_auto_build -Scmake
Expand Down
22 changes: 22 additions & 0 deletions setup.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash
# IT IS UNLIKELY YOU WANT TO EDIT THIS FILE BY HAND
# IF YOU WANT TO CHANGE THE ROS ENVIRONMENT VARIABLES
# EDIT "setup.sh" IN THIS DIRECTORY.

# Load the path of this particular setup.bash

SCRIPT_PATH="${BASH_SOURCE[0]}";
if([ -h "${SCRIPT_PATH}" ]) then
while([ -h "${SCRIPT_PATH}" ]) do SCRIPT_PATH=`readlink "${SCRIPT_PATH}"`; done
fi
pushd . > /dev/null
cd `dirname ${SCRIPT_PATH}` > /dev/null
SCRIPT_PATH=`pwd`;
popd > /dev/null


. $SCRIPT_PATH/setup.sh

if [ -e ${ROS_ROOT}/tools/rosbash/rosbash ]; then
. ${ROS_ROOT}/tools/rosbash/rosbash
fi
2 changes: 2 additions & 0 deletions setup.sh.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PYTHONPATH=@CMAKE_INSTALL_PREFIX@/lib/python$(python -c 'from sys import version_info as v; print "%u.%u" % (v.major, v.minor)'):$PYTHONPATH

13 changes: 13 additions & 0 deletions setup.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/zsh
# IT IS UNLIKELY YOU WANT TO EDIT THIS FILE BY HAND
# IF YOU WANT TO CHANGE THE ROS ENVIRONMENT VARIABLES
# EDIT "setup.sh" IN THIS DIRECTORY.

# Load the path of this particular setup.zsh
SCRIPT_PATH="$(dirname $0)";

. $SCRIPT_PATH/setup.sh

if [ -e ${ROS_ROOT}/tools/rosbash/roszsh ]; then
. ${ROS_ROOT}/tools/rosbash/roszsh
fi

0 comments on commit a581aa3

Please sign in to comment.